Module Name: src
Committed By: pooka
Date: Thu Feb 20 00:41:05 UTC 2014
Modified Files:
src/sys/rump/include/rump: rump.h
src/sys/rump/librump/rumpkern: signals.c
Log Message:
Remove the "host" signal model. I'm not sure it ever made any sense.
I'm also quite sure nobody ever really wanted to use it.
Change the "raise" sigmodel to include the rump kernel PID in the call
to rumpuser_kill(). The purpose is to provide some hint for non-POSIX
platforms which don't sport signals and multiplex many clients in a
single address space.
While this is technically an ABI change, see above. Also, since
rumpuser_kill() was not documented, I'll just claim I'm fixing a bug in
the implementation (and will be sure to document the interface correctly
very soon).
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpkern/signals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.57 src/sys/rump/include/rump/rump.h:1.58
--- src/sys/rump/include/rump/rump.h:1.57 Tue Jul 16 20:17:06 2013
+++ src/sys/rump/include/rump/rump.h Thu Feb 20 00:41:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.57 2013/07/16 20:17:06 pooka Exp $ */
+/* $NetBSD: rump.h,v 1.58 2014/02/20 00:41:05 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -71,7 +71,7 @@ enum rump_uiorw { RUMPUIO_READ, RUMPUIO_
enum rump_sigmodel {
RUMP_SIGMODEL_PANIC,
RUMP_SIGMODEL_IGNORE,
- RUMP_SIGMODEL_HOST,
+ RUMP_SIGMODEL__HOST_NOTANYMORE,
RUMP_SIGMODEL_RAISE,
RUMP_SIGMODEL_RECORD
};
Index: src/sys/rump/librump/rumpkern/signals.c
diff -u src/sys/rump/librump/rumpkern/signals.c:1.12 src/sys/rump/librump/rumpkern/signals.c:1.13
--- src/sys/rump/librump/rumpkern/signals.c:1.12 Fri Nov 22 21:56:24 2013
+++ src/sys/rump/librump/rumpkern/signals.c Thu Feb 20 00:41:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: signals.c,v 1.12 2013/11/22 21:56:24 christos Exp $ */
+/* $NetBSD: signals.c,v 1.13 2014/02/20 00:41:05 pooka Exp $ */
/*-
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: signals.c,v 1.12 2013/11/22 21:56:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: signals.c,v 1.13 2014/02/20 00:41:05 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -84,15 +84,6 @@ rumpsig_ignore(struct proc *p, int signo
return;
}
-/* RUMP_SIGMODEL_HOST */
-
-static void
-rumpsig_host(struct proc *p, int signo)
-{
-
- rumpuser_kill(p->p_pid, signo);
-}
-
/* RUMP_SIGMODEL_RAISE */
static void
@@ -100,7 +91,7 @@ rumpsig_raise(struct proc *p, int signo)
{
if (RUMP_LOCALPROC_P(p)) {
- rumpuser_kill(RUMPUSER_PID_SELF, signo);
+ rumpuser_kill(p->p_pid, signo);
} else {
rumpuser_sp_raise(p->p_vmspace->vm_map.pmap, signo);
}
@@ -139,15 +130,17 @@ rump_boot_setsigmodel(enum rump_sigmodel
case RUMP_SIGMODEL_IGNORE:
rumpsig = rumpsig_ignore;
break;
- case RUMP_SIGMODEL_HOST:
- rumpsig = rumpsig_host;
- break;
case RUMP_SIGMODEL_RAISE:
rumpsig = rumpsig_raise;
break;
case RUMP_SIGMODEL_RECORD:
rumpsig = rumpsig_record;
break;
+
+ /* for compat, though I doubt anyone is using it */
+ case RUMP_SIGMODEL__HOST_NOTANYMORE:
+ rumpsig = rumpsig_raise;
+ break;
}
}
