From 8cb7ba7951bf47e196193f8fa04a746c944464db Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Thu, 12 Jan 2012 23:33:46 +0100 Subject: [PATCH] Remove obsolete PROCSTAT/getsigset call. --- common/include/minix/callnr.h | 1 - include/unistd.h | 2 -- lib/libc/other/Makefile.inc | 1 - lib/libc/other/_getsigset.c | 15 --------------- lib/libc/syscall/Makefile.inc | 1 - lib/libc/syscall/getsigset.S | 6 ------ nbsd_include/unistd.h | 1 - servers/avfs/table.c | 2 +- servers/pm/misc.c | 26 -------------------------- servers/pm/proto.h | 1 - servers/pm/table.c | 2 +- servers/vfs/table.c | 2 +- 12 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 lib/libc/other/_getsigset.c delete mode 100644 lib/libc/syscall/getsigset.S diff --git a/common/include/minix/callnr.h b/common/include/minix/callnr.h index 10cff2dbd..70d1b2203 100644 --- a/common/include/minix/callnr.h +++ b/common/include/minix/callnr.h @@ -98,7 +98,6 @@ */ #define SRV_FORK 101 /* to PM: special fork call for RS */ #define EXEC_RESTART 102 /* to PM: final part of exec for RS */ -#define PROCSTAT 103 /* to PM */ #define GETPROCNR 104 /* to PM */ #define ISSETUGID 106 /* to PM: ask if process is tainted */ #define GETEPINFO_O 107 /* to PM: get pid/uid/gid of an endpoint */ diff --git a/include/unistd.h b/include/unistd.h index 822c30657..53f59b079 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -184,8 +184,6 @@ _PROTOTYPE( char *crypt, (const char *_key, const char *_salt) ); #include #endif - -_PROTOTYPE( int getsigset, (sigset_t *sigset) ); _PROTOTYPE( int getprocnr, (void) ); _PROTOTYPE( int getnprocnr, (pid_t pid) ); _PROTOTYPE( int getpprocnr, (void) ); diff --git a/lib/libc/other/Makefile.inc b/lib/libc/other/Makefile.inc index 025374faa..199b78455 100644 --- a/lib/libc/other/Makefile.inc +++ b/lib/libc/other/Makefile.inc @@ -19,7 +19,6 @@ SRCS+= \ _getnprocnr.c \ _getpprocnr.c \ _getprocnr.c \ - _getsigset.c \ _lseek64.c \ _mapdriver.c \ _mcontext.c \ diff --git a/lib/libc/other/_getsigset.c b/lib/libc/other/_getsigset.c deleted file mode 100644 index 74db36a6f..000000000 --- a/lib/libc/other/_getsigset.c +++ /dev/null @@ -1,15 +0,0 @@ -#include -#define getsigset _getsigset -#include - - -PUBLIC int getsigset(sp) -sigset_t *sp; /* where to put it */ -{ - message m; - m.m2_i1 = SELF; /* request own signal set */ - if (_syscall(PM_PROC_NR, PROCSTAT, &m) < 0) return(-1); - *sp = m.m2_l1; - return(0); -} - diff --git a/lib/libc/syscall/Makefile.inc b/lib/libc/syscall/Makefile.inc index 6c81ffcce..3852d1e5a 100644 --- a/lib/libc/syscall/Makefile.inc +++ b/lib/libc/syscall/Makefile.inc @@ -55,7 +55,6 @@ SRCS+= \ getppid.S \ getpprocnr.S \ getprocnr.S \ - getsigset.S \ getuid.S \ ioctl.S \ isatty.S \ diff --git a/lib/libc/syscall/getsigset.S b/lib/libc/syscall/getsigset.S deleted file mode 100644 index 26646cd97..000000000 --- a/lib/libc/syscall/getsigset.S +++ /dev/null @@ -1,6 +0,0 @@ -#include - -IMPORT(_getsigset) -ENTRY(getsigset) - jmp _C_LABEL(_getsigset) - diff --git a/nbsd_include/unistd.h b/nbsd_include/unistd.h index 84bdadd73..0f16daa73 100644 --- a/nbsd_include/unistd.h +++ b/nbsd_include/unistd.h @@ -310,7 +310,6 @@ int lseek64(int fd, u64_t _offset, int _whence, u64_t *_newpos); #if defined(_MINIX) #include -int getsigset(sigset_t *sigset); int getprocnr(void); int getnprocnr(pid_t pid); int getpprocnr(void); diff --git a/servers/avfs/table.c b/servers/avfs/table.c index c4a4173bc..335c71546 100644 --- a/servers/avfs/table.c +++ b/servers/avfs/table.c @@ -118,7 +118,7 @@ PUBLIC _PROTOTYPE (int (*call_vec[]), (void) ) = { no_sys, /* 100 = (exec_newmem) */ no_sys, /* 101 = (srv_fork) */ no_sys, /* 102 = (exec_restart) */ - no_sys, /* 103 = (procstat) */ + no_sys, /* 103 = unused */ no_sys, /* 104 = (getprocnr) */ no_sys, /* 105 = unused */ no_sys, /* 106 = unused */ diff --git a/servers/pm/misc.c b/servers/pm/misc.c index ea28e2d8f..1e40f6c77 100644 --- a/servers/pm/misc.c +++ b/servers/pm/misc.c @@ -2,7 +2,6 @@ * 31 Mar 2000 * The entry points into this file are: * do_reboot: kill all processes, then reboot system - * do_procstat: request process status (Jorrit N. Herder) * do_getsysinfo: request copy of PM data structure (Jorrit N. Herder) * do_getprocnr: lookup process slot number (Jorrit N. Herder) * do_getepinfo: get the pid/uid/gid of a process given its endpoint @@ -60,31 +59,6 @@ PRIVATE char *uts_tbl[] = { PUBLIC unsigned long calls_stats[NCALLS]; #endif -/*===========================================================================* - * do_procstat * - *===========================================================================*/ -PUBLIC int do_procstat() -{ - /* For the moment, this is only used to return pending signals to - * system processes that request the PM for their own status. - * - * Future use might include the VFS requesting for process status of - * any user process. - */ - - /* This call should be removed, or made more general. */ - - if (m_in.stat_nr == SELF) { - mp->mp_reply.sig_set = mp->mp_sigpending; - (void) sigemptyset(&mp->mp_sigpending); - (void) sigemptyset(&mp->mp_ksigpending); - } - else { - return(ENOSYS); - } - return(OK); -} - /*===========================================================================* * do_sysuname * *===========================================================================*/ diff --git a/servers/pm/proto.h b/servers/pm/proto.h index f7858a06e..f4c7647d1 100644 --- a/servers/pm/proto.h +++ b/servers/pm/proto.h @@ -56,7 +56,6 @@ _PROTOTYPE( int do_setmcontext, (void) ); /* misc.c */ _PROTOTYPE( int do_reboot, (void) ); -_PROTOTYPE( int do_procstat, (void) ); _PROTOTYPE( int do_sysuname, (void) ); _PROTOTYPE( int do_getsysinfo, (void) ); _PROTOTYPE( int do_getprocnr, (void) ); diff --git a/servers/pm/table.c b/servers/pm/table.c index cd8c6d88c..bb41df2ca 100644 --- a/servers/pm/table.c +++ b/servers/pm/table.c @@ -114,7 +114,7 @@ _PROTOTYPE (int (*call_vec[]), (void) ) = { do_exec_newmem, /* 100 = exec_newmem */ do_srv_fork, /* 101 = srv_fork */ do_execrestart, /* 102 = exec_restart */ - do_procstat, /* 103 = procstat */ + no_sys, /* 103 = unused */ do_getprocnr, /* 104 = getprocnr */ no_sys, /* 105 = unused */ do_get, /* 106 = issetugid */ diff --git a/servers/vfs/table.c b/servers/vfs/table.c index e0434caff..e47e7111f 100644 --- a/servers/vfs/table.c +++ b/servers/vfs/table.c @@ -118,7 +118,7 @@ PUBLIC _PROTOTYPE (int (*call_vec[]), (void) ) = { no_sys, /* 100 = (exec_newmem) */ no_sys, /* 101 = (srv_fork) */ no_sys, /* 102 = (exec_restart) */ - no_sys, /* 103 = (procstat) */ + no_sys, /* 103 = unused */ no_sys, /* 104 = (getprocnr) */ no_sys, /* 105 = unused */ no_sys, /* 106 = unused */ -- 2.44.0