CVS commit: src/lib

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Sun Jan  2 13:01:45 UTC 2011

Modified Files:
        src/lib/libp2k: p2k.c
        src/lib/librumpuser: rumpuser_sp.c
        src/lib/libukfs: ukfs.c

Log Message:
rump_lwproc_newproc -> rump_lwproc_rfork


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.27 -r1.28 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.55 -r1.56 src/lib/libukfs/ukfs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.48 src/lib/libp2k/p2k.c:1.49
--- src/lib/libp2k/p2k.c:1.48	Sun Jan  2 05:04:59 2011
+++ src/lib/libp2k/p2k.c	Sun Jan  2 13:01:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: p2k.c,v 1.48 2011/01/02 05:04:59 dholland Exp $	*/
+/*	$NetBSD: p2k.c,v 1.49 2011/01/02 13:01:45 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -362,7 +362,7 @@
 	if (p2m)
 		rump_init();
 
-	rump_pub_lwproc_newproc();
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
 
 	return p2m;
 }

Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.27 src/lib/librumpuser/rumpuser_sp.c:1.28
--- src/lib/librumpuser/rumpuser_sp.c:1.27	Thu Dec 16 17:05:44 2010
+++ src/lib/librumpuser/rumpuser_sp.c	Sun Jan  2 13:01:45 2011
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpuser_sp.c,v 1.27 2010/12/16 17:05:44 pooka Exp $	*/
+/*      $NetBSD: rumpuser_sp.c,v 1.28 2011/01/02 13:01:45 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.27 2010/12/16 17:05:44 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.28 2011/01/02 13:01:45 pooka Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
@@ -57,6 +57,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <rump/rump.h> /* XXX: for rfork flags */
 #include <rump/rumpuser.h>
 #include "rumpuser_int.h"
 
@@ -110,12 +111,12 @@
 }
 
 static int
-lwproc_newproc(struct spclient *spc)
+lwproc_rfork(struct spclient *spc, int flags)
 {
 	int rv;
 
 	spops.spop_schedule();
-	rv = spops.spop_lwproc_newproc(spc);
+	rv = spops.spop_lwproc_rfork(spc, flags);
 	spops.spop_unschedule();
 
 	return rv;
@@ -463,7 +464,7 @@
 			break;
 	}
 
-	if (lwproc_newproc(&spclist[i]) != 0) {
+	if (lwproc_rfork(&spclist[i], RUMP_RFCFDG) != 0) {
 		close(newfd);
 		return 0;
 	}

Index: src/lib/libukfs/ukfs.c
diff -u src/lib/libukfs/ukfs.c:1.55 src/lib/libukfs/ukfs.c:1.56
--- src/lib/libukfs/ukfs.c:1.55	Fri Nov 26 11:10:53 2010
+++ src/lib/libukfs/ukfs.c	Sun Jan  2 13:01:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ukfs.c,v 1.55 2010/11/26 11:10:53 pooka Exp $	*/
+/*	$NetBSD: ukfs.c,v 1.56 2011/01/02 13:01:45 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -122,7 +122,7 @@
 	*curlwp = rump_pub_lwproc_curlwp();
 	if (*curlwp)
 		rump_pub_lwproc_switch(ukfs->ukfs_lwp);
-	rump_pub_lwproc_newproc();
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
 
 	if (rump_sys_chroot(ukfs->ukfs_mountpath) == -1)
 		return errno;
@@ -671,7 +671,7 @@
 
 	/* get root lwp */
 	rump_pub_lwproc_switch(fs->ukfs_lwp);
-	rump_pub_lwproc_newproc();
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
 
 	if ((flags & UKFS_RELFLAG_NOUNMOUNT) == 0) {
 		int rv, mntflag, error;