 @@ -1,39 +1,39 @@
-.\"	$NetBSD: rump_allserver.1,v 1.15 2011/02/18 09:54:03 pooka Exp $
+.\"	$NetBSD: rump_allserver.1,v 1.16 2011/02/21 18:50:21 pooka Exp $
 .\"
 .\" Copyright (c) 2010 Antti Kantee.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 17, 2011
+.Dd February 21, 2011
 .Dt RUMP_SERVER 1
 .Os
 .Sh NAME
 .Nm rump_server ,
 .Nm rump_allserver
 .Nd rump kernel server
 .Sh SYNOPSIS
 .Nm
 .Op Fl s
 .Op Fl c Ar ncpu
 .Op Fl d Ar drivespec
 .Op Fl l Ar library
 .Op Fl m Ar module
 @@ -149,32 +149,43 @@ will also be initialized.
 .Pp
 The argument
 .Ar library
 can contain a full path or a filename, in which case the standard
 dynamic library search path will be used.
 Libraries are loaded in the order they are given.
 Dependencies are not autoloaded, and the order must be specified
 correctly.
 .It Fl m Ar module
 Load and link a kernel module after the rump kernel is initialized.
 For this to work, the rump kernel must include the vfs faction,
 since the module is loaded using kernel vfs code (see
 .Sx EXAMPLES ) .
 .It Fl r Ar total_ram
 Sets the limit of kernel memory allocatable by the server to
 .Ar total_ram
 as opposed to the default which allows the server to allocate as much
 memory as the host will give it.
 This parameter is especially useful for VFS servers, since by
 default the virtual file system will attempt to consume as much
 memory as it can, and accessing large files can cause an excessive
 amount of memory to be used as file system cache.
 .It Fl s
 Do not detach from the terminal.
 By default,
 .Nm
 detaches from the terminal once the service is running on
 .Ar url .
 .It Fl v
 Set bootverbose.
 .El
 .Pp
 After use,
 .Nm
 can be made to exit using
 .Xr rump.halt 1 .
 .Sh EXAMPLES
 Start a server and load the tmpfs file system module, and halt the
 server immediately afterwards:
 .Bd -literal -offset indent
 $ rump_server -lrumpvfs -m /modules/tmpfs.kmod unix://sock
 $ env RUMP_SERVER=unix://sock rump.halt
 .Ed
 @@ -182,17 +193,22 @@ $ env RUMP_SERVER=unix://sock rump.halt
 Start a server with the one gigabyte host file
 .Pa dk.img
 mapped as the block device
 .Pa /dev/dk
 in the rump kernel.
 .Bd -literal -offset indent
 $ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1g unix://sock
 .Ed
 .Pp
 Start a server which listens on INADDR_ANY port 3755
 .Bd -literal -offset indent
 $ rump_server tcp://0:3755/
 .Ed
 .Pp
 Start a FFS server with a 16MB kernel memory limit.
 .Bd -literal -offset indent
 $ rump_server -lrumpvfs -lrumpfs_ffs -r 16m unix:///tmp/ffs_server
 .Ed
 .Sh SEE ALSO
 .Xr rump.halt 1 ,
 .Xr dlopen 3 ,
 .Xr rump 3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump_allserver.c,v 1.19 2011/02/18 09:54:03 pooka Exp $	*/
+/*	$NetBSD: rump_allserver.c,v 1.20 2011/02/21 18:50:21 pooka Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,27 +17,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rump_allserver.c,v 1.19 2011/02/18 09:54:03 pooka Exp $");
+__RCSID("$NetBSD: rump_allserver.c,v 1.20 2011/02/21 18:50:21 pooka Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/disklabel.h>
 #include <sys/signal.h>
 #include <sys/module.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 #include <dlfcn.h>
 #include <err.h>
 #include <errno.h>
 @@ -116,27 +116,27 @@ main(int argc, char *argv[])
+{
 	const char *serverurl;
 	char **modarray = NULL;
 	unsigned nmods = 0, curmod = 0, i;
 	struct etfsreg *etfs = NULL;
 	unsigned netfs = 0, curetfs = 0;
 	int error;
 	int ch, sflag;
 	int ncpu;
 	setprogname(argv[0]);
 	sflag = 0;
-	while ((ch = getopt(argc, argv, "c:d:l:m:s")) != -1) {
+	while ((ch = getopt(argc, argv, "c:d:l:m:r:sv")) != -1) {
 		switch (ch) {
 		case 'c':
 			ncpu = atoi(optarg);
 			/* XXX: MAXCPUS is from host, not from kernel */
 			if (ncpu < 1 || ncpu > MAXCPUS)
 				err(1, "CPU count needs to be between "
 				    "1 and %d\n", MAXCPUS);
 			setenv("RUMP_NCPU", optarg, 1);
 			break;
 		case 'd': {
 			char *options, *value;
 			char *key, *hostpath;
 			long long flen, foffset;
 @@ -289,29 +289,35 @@ main(int argc, char *argv[])
+				}
+			}
 			break;
 		case 'm':
 			if (nmods - curmod == 0) {
 				modarray = realloc(modarray,
 				    (nmods+16) * sizeof(char *));
 				if (modarray == NULL)
 					err(1, "realloc");
 				nmods += 16;
+			}
 			modarray[curmod++] = optarg;
 			break;
 		case 'r':
 			setenv("RUMP_MEMLIMIT", optarg, 1);
 			break;
 		case 's':
 			sflag = 1;
 			break;
 		case 'v':
 			setenv("RUMP_VERBOSE", "1", 1);
 			break;
 		default:
 			usage();
 			/*NOTREACHED*/
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc != 1)
 		usage();
 	serverurl = argv[0];