diff options
| author | cgd <cgd@NetBSD.org> | 1994-05-17 10:37:09 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1994-05-17 10:37:09 +0000 |
| commit | da707cc4ebe2fa970b2f098c6e8846b03bdbb06e (patch) | |
| tree | 918897e31bcb88287d9a8b87a2ee0e664c3e4b7b /sys | |
| parent | 08124ce51b30d002eba4c40bbf935bf1808e056c (diff) | |
syscall and time stuff
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hp300/hpux/hpux_compat.c | 8 | ||||
| -rw-r--r-- | sys/arch/hp300/hpux/hpux_sig.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/hpux/hpux_syscall.h | 8 | ||||
| -rw-r--r-- | sys/arch/hp300/hpux/hpux_syscalls.c | 8 | ||||
| -rw-r--r-- | sys/arch/hp300/hpux/hpux_sysent.c | 22 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_compat.c | 8 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_sig.c | 4 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_syscall.h | 8 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_syscalls.c | 8 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_sysent.c | 22 |
10 files changed, 52 insertions, 48 deletions
diff --git a/sys/arch/hp300/hpux/hpux_compat.c b/sys/arch/hp300/hpux/hpux_compat.c index 1057d444177..38b1117a460 100644 --- a/sys/arch/hp300/hpux/hpux_compat.c +++ b/sys/arch/hp300/hpux/hpux_compat.c @@ -37,7 +37,7 @@ * * from: Utah Hdr: hpux_compat.c 1.41 91/04/06 * from: @(#)hpux_compat.c 7.16 (Berkeley) 5/30/91 - * $Id: hpux_compat.c,v 1.7 1994/05/05 10:11:52 mycroft Exp $ + * $Id: hpux_compat.c,v 1.8 1994/05/17 10:37:09 cgd Exp $ */ /* @@ -1528,11 +1528,13 @@ ohpux_times(p, uap, retval) register struct ohpux_times_args *uap; time_t *retval; { + struct timeval ru, rs; struct tms atms; int error; - atms.tms_utime = hpux_scale(&p->p_utime); - atms.tms_stime = hpux_scale(&p->p_stime); + calcru(p, &ru, &rs, NULL); + atms.tms_utime = hpux_scale(&ru); + atms.tms_stime = hpux_scale(&rs); atms.tms_cutime = hpux_scale(&p->p_stats->p_cru.ru_utime); atms.tms_cstime = hpux_scale(&p->p_stats->p_cru.ru_stime); error = copyout((caddr_t)&atms, (caddr_t)uap->tmsb, sizeof (atms)); diff --git a/sys/arch/hp300/hpux/hpux_sig.c b/sys/arch/hp300/hpux/hpux_sig.c index b356ea90e94..59684333507 100644 --- a/sys/arch/hp300/hpux/hpux_sig.c +++ b/sys/arch/hp300/hpux/hpux_sig.c @@ -37,7 +37,7 @@ * * from: Utah Hdr: hpux_sig.c 1.1 90/07/09 * from: @(#)hpux_sig.c 7.8 (Berkeley) 4/20/91 - * $Id: hpux_sig.c,v 1.7 1994/05/05 10:12:01 mycroft Exp $ + * $Id: hpux_sig.c,v 1.8 1994/05/17 10:37:12 cgd Exp $ */ /* @@ -271,7 +271,7 @@ hpux_sigpending(p, uap, retval) { hpux_sigset_t sigset; - sigset.sigset[0] = bsdtohpuxmask(p->p_sig); + sigset.sigset[0] = bsdtohpuxmask(p->p_siglist); return (copyout((caddr_t)&sigset, (caddr_t)uap->set, sizeof(sigset))); } diff --git a/sys/arch/hp300/hpux/hpux_syscall.h b/sys/arch/hp300/hpux/hpux_syscall.h index 2d5db79ae8e..0d0b5c5233c 100644 --- a/sys/arch/hp300/hpux/hpux_syscall.h +++ b/sys/arch/hp300/hpux/hpux_syscall.h @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: hpux_syscall.h,v 1.1 1994/01/07 00:43:55 mycroft Exp $ + * created from $Id: hpux_syscall.h,v 1.2 1994/05/17 10:37:14 cgd Exp $ */ #define SYS_nosys 0 @@ -113,7 +113,7 @@ #define SYS_hpux_sigblock 109 #define SYS_hpux_sigsetmask 110 #define SYS_hpux_sigpause 111 -#define SYS_sigstack 112 +#define SYS_osigstack 112 #define SYS_nosys 113 #define SYS_nosys 114 #define SYS_nosys 115 @@ -244,11 +244,11 @@ #define SYS_async_daemon 229 #define SYS_nfs_fcntl 230 #define SYS_getdirentries 231 -#define SYS_getdomainname 232 +#define SYS_ogetdomainname 232 #define SYS_nfs_getfh 233 #define SYS_vfsmount 234 #define SYS_nfs_svc 235 -#define SYS_setdomainname 236 +#define SYS_osetdomainname 236 #define SYS_statfs 237 #define SYS_fstatfs 238 #define SYS_hpux_sigaction 239 diff --git a/sys/arch/hp300/hpux/hpux_syscalls.c b/sys/arch/hp300/hpux/hpux_syscalls.c index 1f3065bde50..30eae4069db 100644 --- a/sys/arch/hp300/hpux/hpux_syscalls.c +++ b/sys/arch/hp300/hpux/hpux_syscalls.c @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: hpux_syscalls.c,v 1.4 1994/01/07 00:43:57 mycroft Exp $ + * created from $Id: hpux_syscalls.c,v 1.5 1994/05/17 10:37:16 cgd Exp $ */ char *hpux_syscallnames[] = { @@ -118,7 +118,7 @@ char *hpux_syscallnames[] = { "hpux_sigblock", /* 109 = hpux_sigblock */ "hpux_sigsetmask", /* 110 = hpux_sigsetmask */ "hpux_sigpause", /* 111 = hpux_sigpause */ - "sigstack", /* 112 = sigstack */ + "osigstack", /* 112 = osigstack */ "nosys", /* 113 = nosys */ "nosys", /* 114 = nosys */ "nosys", /* 115 = nosys */ @@ -258,11 +258,11 @@ char *hpux_syscallnames[] = { "async_daemon", /* 229 = async_daemon */ "nfs_fcntl", /* 230 = nfs_fcntl */ "getdirentries", /* 231 = getdirentries */ - "getdomainname", /* 232 = getdomainname */ + "ogetdomainname", /* 232 = ogetdomainname */ "nfs_getfh", /* 233 = nfs_getfh */ "vfsmount", /* 234 = vfsmount */ "nfs_svc", /* 235 = nfs_svc */ - "setdomainname", /* 236 = setdomainname */ + "osetdomainname", /* 236 = osetdomainname */ "statfs", /* 237 = statfs */ "fstatfs", /* 238 = fstatfs */ "hpux_sigaction", /* 239 = hpux_sigaction */ diff --git a/sys/arch/hp300/hpux/hpux_sysent.c b/sys/arch/hp300/hpux/hpux_sysent.c index e9666e3428c..07d1ada35af 100644 --- a/sys/arch/hp300/hpux/hpux_sysent.c +++ b/sys/arch/hp300/hpux/hpux_sysent.c @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: hpux_sysent.c,v 1.4 1994/01/07 00:43:59 mycroft Exp $ + * created from $Id: hpux_sysent.c,v 1.5 1994/05/17 10:37:18 cgd Exp $ */ #include <sys/param.h> @@ -11,7 +11,7 @@ int nosys(); int nosys(); -int rexit(); +int exit(); int fork(); int hpux_read(); int hpux_write(); @@ -34,7 +34,7 @@ int notimp(); int setuid(); int getuid(); int hpux_ptrace(); -int saccess(); +int access(); int sync(); int hpux_kill(); int hpux_stat(); @@ -104,7 +104,7 @@ int hpux_sigvec(); int hpux_sigblock(); int hpux_sigsetmask(); int hpux_sigpause(); -int sigstack(); +int osigstack(); int nosys(); int nosys(); int nosys(); @@ -244,11 +244,11 @@ int nosys(); int notimp(); int notimp(); int getdirentries(); -int getdomainname(); +int ogetdomainname(); int notimp(); int notimp(); int notimp(); -int setdomainname(); +int osetdomainname(); int notimp(); int notimp(); int hpux_sigaction(); @@ -289,7 +289,7 @@ int ohpux_ssig(); struct sysent hpux_sysent[] = { { 0, nosys }, /* 0 = nosys */ - { 1, rexit }, /* 1 = exit */ + { 1, exit }, /* 1 = exit */ { 0, fork }, /* 2 = fork */ { 3, hpux_read }, /* 3 = hpux_read */ { 3, hpux_write }, /* 4 = hpux_write */ @@ -321,7 +321,7 @@ struct sysent hpux_sysent[] = { { compat(2,hpux_utime) }, /* 30 = old hpux_utime */ { compat(2,hpux_stty) }, /* 31 = old hpux_stty */ { compat(2,hpux_gtty) }, /* 32 = old hpux_gtty */ - { 2, saccess }, /* 33 = access */ + { 2, access }, /* 33 = access */ { compat(1,hpux_nice) }, /* 34 = old hpux_nice */ { compat(1,hpux_ftime) }, /* 35 = old hpux_ftime */ { 0, sync }, /* 36 = sync */ @@ -400,7 +400,7 @@ struct sysent hpux_sysent[] = { { 1, hpux_sigblock }, /* 109 = hpux_sigblock */ { 1, hpux_sigsetmask }, /* 110 = hpux_sigsetmask */ { 1, hpux_sigpause }, /* 111 = hpux_sigpause */ - { 2, sigstack }, /* 112 = sigstack */ + { 2, osigstack }, /* 112 = osigstack */ { 0, nosys }, /* 113 = nosys */ { 0, nosys }, /* 114 = nosys */ { 0, nosys }, /* 115 = nosys */ @@ -540,11 +540,11 @@ struct sysent hpux_sysent[] = { { 0, notimp }, /* 229 = async_daemon */ { 3, notimp }, /* 230 = nfs_fcntl */ { 4, getdirentries }, /* 231 = getdirentries */ - { 2, getdomainname }, /* 232 = getdomainname */ + { 2, ogetdomainname }, /* 232 = ogetdomainname */ { 2, notimp }, /* 233 = nfs_getfh */ { 4, notimp }, /* 234 = vfsmount */ { 1, notimp }, /* 235 = nfs_svc */ - { 2, setdomainname }, /* 236 = setdomainname */ + { 2, osetdomainname }, /* 236 = osetdomainname */ { 0, notimp }, /* 237 = statfs */ { 0, notimp }, /* 238 = fstatfs */ { 3, hpux_sigaction }, /* 239 = hpux_sigaction */ diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c index 1057d444177..38b1117a460 100644 --- a/sys/compat/hpux/hpux_compat.c +++ b/sys/compat/hpux/hpux_compat.c @@ -37,7 +37,7 @@ * * from: Utah Hdr: hpux_compat.c 1.41 91/04/06 * from: @(#)hpux_compat.c 7.16 (Berkeley) 5/30/91 - * $Id: hpux_compat.c,v 1.7 1994/05/05 10:11:52 mycroft Exp $ + * $Id: hpux_compat.c,v 1.8 1994/05/17 10:37:09 cgd Exp $ */ /* @@ -1528,11 +1528,13 @@ ohpux_times(p, uap, retval) register struct ohpux_times_args *uap; time_t *retval; { + struct timeval ru, rs; struct tms atms; int error; - atms.tms_utime = hpux_scale(&p->p_utime); - atms.tms_stime = hpux_scale(&p->p_stime); + calcru(p, &ru, &rs, NULL); + atms.tms_utime = hpux_scale(&ru); + atms.tms_stime = hpux_scale(&rs); atms.tms_cutime = hpux_scale(&p->p_stats->p_cru.ru_utime); atms.tms_cstime = hpux_scale(&p->p_stats->p_cru.ru_stime); error = copyout((caddr_t)&atms, (caddr_t)uap->tmsb, sizeof (atms)); diff --git a/sys/compat/hpux/hpux_sig.c b/sys/compat/hpux/hpux_sig.c index b356ea90e94..59684333507 100644 --- a/sys/compat/hpux/hpux_sig.c +++ b/sys/compat/hpux/hpux_sig.c @@ -37,7 +37,7 @@ * * from: Utah Hdr: hpux_sig.c 1.1 90/07/09 * from: @(#)hpux_sig.c 7.8 (Berkeley) 4/20/91 - * $Id: hpux_sig.c,v 1.7 1994/05/05 10:12:01 mycroft Exp $ + * $Id: hpux_sig.c,v 1.8 1994/05/17 10:37:12 cgd Exp $ */ /* @@ -271,7 +271,7 @@ hpux_sigpending(p, uap, retval) { hpux_sigset_t sigset; - sigset.sigset[0] = bsdtohpuxmask(p->p_sig); + sigset.sigset[0] = bsdtohpuxmask(p->p_siglist); return (copyout((caddr_t)&sigset, (caddr_t)uap->set, sizeof(sigset))); } diff --git a/sys/compat/hpux/hpux_syscall.h b/sys/compat/hpux/hpux_syscall.h index 2d5db79ae8e..0d0b5c5233c 100644 --- a/sys/compat/hpux/hpux_syscall.h +++ b/sys/compat/hpux/hpux_syscall.h @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: hpux_syscall.h,v 1.1 1994/01/07 00:43:55 mycroft Exp $ + * created from $Id: hpux_syscall.h,v 1.2 1994/05/17 10:37:14 cgd Exp $ */ #define SYS_nosys 0 @@ -113,7 +113,7 @@ #define SYS_hpux_sigblock 109 #define SYS_hpux_sigsetmask 110 #define SYS_hpux_sigpause 111 -#define SYS_sigstack 112 +#define SYS_osigstack 112 #define SYS_nosys 113 #define SYS_nosys 114 #define SYS_nosys 115 @@ -244,11 +244,11 @@ #define SYS_async_daemon 229 #define SYS_nfs_fcntl 230 #define SYS_getdirentries 231 -#define SYS_getdomainname 232 +#define SYS_ogetdomainname 232 #define SYS_nfs_getfh 233 #define SYS_vfsmount 234 #define SYS_nfs_svc 235 -#define SYS_setdomainname 236 +#define SYS_osetdomainname 236 #define SYS_statfs 237 #define SYS_fstatfs 238 #define SYS_hpux_sigaction 239 diff --git a/sys/compat/hpux/hpux_syscalls.c b/sys/compat/hpux/hpux_syscalls.c index 1f3065bde50..30eae4069db 100644 --- a/sys/compat/hpux/hpux_syscalls.c +++ b/sys/compat/hpux/hpux_syscalls.c @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: hpux_syscalls.c,v 1.4 1994/01/07 00:43:57 mycroft Exp $ + * created from $Id: hpux_syscalls.c,v 1.5 1994/05/17 10:37:16 cgd Exp $ */ char *hpux_syscallnames[] = { @@ -118,7 +118,7 @@ char *hpux_syscallnames[] = { "hpux_sigblock", /* 109 = hpux_sigblock */ "hpux_sigsetmask", /* 110 = hpux_sigsetmask */ "hpux_sigpause", /* 111 = hpux_sigpause */ - "sigstack", /* 112 = sigstack */ + "osigstack", /* 112 = osigstack */ "nosys", /* 113 = nosys */ "nosys", /* 114 = nosys */ "nosys", /* 115 = nosys */ @@ -258,11 +258,11 @@ char *hpux_syscallnames[] = { "async_daemon", /* 229 = async_daemon */ "nfs_fcntl", /* 230 = nfs_fcntl */ "getdirentries", /* 231 = getdirentries */ - "getdomainname", /* 232 = getdomainname */ + "ogetdomainname", /* 232 = ogetdomainname */ "nfs_getfh", /* 233 = nfs_getfh */ "vfsmount", /* 234 = vfsmount */ "nfs_svc", /* 235 = nfs_svc */ - "setdomainname", /* 236 = setdomainname */ + "osetdomainname", /* 236 = osetdomainname */ "statfs", /* 237 = statfs */ "fstatfs", /* 238 = fstatfs */ "hpux_sigaction", /* 239 = hpux_sigaction */ diff --git a/sys/compat/hpux/hpux_sysent.c b/sys/compat/hpux/hpux_sysent.c index e9666e3428c..07d1ada35af 100644 --- a/sys/compat/hpux/hpux_sysent.c +++ b/sys/compat/hpux/hpux_sysent.c @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: hpux_sysent.c,v 1.4 1994/01/07 00:43:59 mycroft Exp $ + * created from $Id: hpux_sysent.c,v 1.5 1994/05/17 10:37:18 cgd Exp $ */ #include <sys/param.h> @@ -11,7 +11,7 @@ int nosys(); int nosys(); -int rexit(); +int exit(); int fork(); int hpux_read(); int hpux_write(); @@ -34,7 +34,7 @@ int notimp(); int setuid(); int getuid(); int hpux_ptrace(); -int saccess(); +int access(); int sync(); int hpux_kill(); int hpux_stat(); @@ -104,7 +104,7 @@ int hpux_sigvec(); int hpux_sigblock(); int hpux_sigsetmask(); int hpux_sigpause(); -int sigstack(); +int osigstack(); int nosys(); int nosys(); int nosys(); @@ -244,11 +244,11 @@ int nosys(); int notimp(); int notimp(); int getdirentries(); -int getdomainname(); +int ogetdomainname(); int notimp(); int notimp(); int notimp(); -int setdomainname(); +int osetdomainname(); int notimp(); int notimp(); int hpux_sigaction(); @@ -289,7 +289,7 @@ int ohpux_ssig(); struct sysent hpux_sysent[] = { { 0, nosys }, /* 0 = nosys */ - { 1, rexit }, /* 1 = exit */ + { 1, exit }, /* 1 = exit */ { 0, fork }, /* 2 = fork */ { 3, hpux_read }, /* 3 = hpux_read */ { 3, hpux_write }, /* 4 = hpux_write */ @@ -321,7 +321,7 @@ struct sysent hpux_sysent[] = { { compat(2,hpux_utime) }, /* 30 = old hpux_utime */ { compat(2,hpux_stty) }, /* 31 = old hpux_stty */ { compat(2,hpux_gtty) }, /* 32 = old hpux_gtty */ - { 2, saccess }, /* 33 = access */ + { 2, access }, /* 33 = access */ { compat(1,hpux_nice) }, /* 34 = old hpux_nice */ { compat(1,hpux_ftime) }, /* 35 = old hpux_ftime */ { 0, sync }, /* 36 = sync */ @@ -400,7 +400,7 @@ struct sysent hpux_sysent[] = { { 1, hpux_sigblock }, /* 109 = hpux_sigblock */ { 1, hpux_sigsetmask }, /* 110 = hpux_sigsetmask */ { 1, hpux_sigpause }, /* 111 = hpux_sigpause */ - { 2, sigstack }, /* 112 = sigstack */ + { 2, osigstack }, /* 112 = osigstack */ { 0, nosys }, /* 113 = nosys */ { 0, nosys }, /* 114 = nosys */ { 0, nosys }, /* 115 = nosys */ @@ -540,11 +540,11 @@ struct sysent hpux_sysent[] = { { 0, notimp }, /* 229 = async_daemon */ { 3, notimp }, /* 230 = nfs_fcntl */ { 4, getdirentries }, /* 231 = getdirentries */ - { 2, getdomainname }, /* 232 = getdomainname */ + { 2, ogetdomainname }, /* 232 = ogetdomainname */ { 2, notimp }, /* 233 = nfs_getfh */ { 4, notimp }, /* 234 = vfsmount */ { 1, notimp }, /* 235 = nfs_svc */ - { 2, setdomainname }, /* 236 = setdomainname */ + { 2, osetdomainname }, /* 236 = osetdomainname */ { 0, notimp }, /* 237 = statfs */ { 0, notimp }, /* 238 = fstatfs */ { 3, hpux_sigaction }, /* 239 = hpux_sigaction */ |
