Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Merge the nathanw_sa branch.
details: https://anonhg.NetBSD.org/src/rev/31e9225f0467
branches: trunk
changeset: 541776:31e9225f0467
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Jan 18 10:52:16 2003 +0000
description:
Merge the nathanw_sa branch.
diffstat:
bin/ps/extern.h | 58 +-
bin/ps/keyword.c | 26 +-
bin/ps/nlist.c | 5 +-
bin/ps/print.c | 255 +++++++++++----
bin/ps/ps.1 | 23 +-
bin/ps/ps.c | 160 ++++++++-
bin/ps/ps.h | 12 +-
lib/libc/Makefile | 3 +-
lib/libc/arch/alpha/gen/Makefile.inc | 4 +-
lib/libc/arch/alpha/gen/_lwp.c | 64 ++++
lib/libc/arch/alpha/gen/makecontext.c | 79 ++++
lib/libc/arch/alpha/gen/resumecontext.c | 56 +++
lib/libc/arch/alpha/gen/swapcontext.S | 62 +++
lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/alpha/sys/getcontext.S | 50 +++
lib/libc/arch/alpha/sys/setlogin.S | 37 --
lib/libc/arch/arm/gen/Makefile.inc | 9 +-
lib/libc/arch/arm/gen/_lwp.c | 65 ++++
lib/libc/arch/arm/gen/makecontext.c | 80 +++++
lib/libc/arch/arm/gen/resumecontext.c | 56 +++
lib/libc/arch/arm/gen/swapcontext.S | 65 ++++
lib/libc/arch/arm/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/arm/sys/getcontext.S | 65 ++++
lib/libc/arch/arm/sys/setlogin.S | 69 ----
lib/libc/arch/i386/gen/Makefile.inc | 12 +-
lib/libc/arch/i386/gen/_lwp.c | 70 ++++
lib/libc/arch/i386/gen/makecontext.c | 98 ++++++
lib/libc/arch/i386/gen/resumecontext.S | 71 ++++
lib/libc/arch/i386/gen/swapcontext.S | 79 ++++
lib/libc/arch/i386/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/i386/sys/getcontext.S | 57 +++
lib/libc/arch/i386/sys/setlogin.S | 59 ---
lib/libc/arch/m68k/gen/Makefile.inc | 8 +-
lib/libc/arch/m68k/gen/_lwp.c | 64 ++++
lib/libc/arch/m68k/gen/makecontext.c | 72 ++++
lib/libc/arch/m68k/gen/resumecontext.S | 58 +++
lib/libc/arch/m68k/gen/swapcontext.S | 56 +++
lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/m68k/sys/getcontext.S | 54 +++
lib/libc/arch/m68k/sys/setlogin.S | 62 ---
lib/libc/arch/mips/gen/Makefile.inc | 7 +-
lib/libc/arch/mips/gen/_lwp.c | 65 ++++
lib/libc/arch/mips/gen/_resumecontext.S | 55 +++
lib/libc/arch/mips/gen/makecontext.c | 85 +++++
lib/libc/arch/mips/gen/resumecontext.c | 56 +++
lib/libc/arch/mips/gen/swapcontext.S | 76 ++++
lib/libc/arch/mips/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/mips/sys/cerror.S | 29 +-
lib/libc/arch/mips/sys/getcontext.S | 61 +++
lib/libc/arch/mips/sys/setlogin.S | 60 ---
lib/libc/arch/powerpc/gen/Makefile.inc | 6 +-
lib/libc/arch/powerpc/gen/_lwp.c | 61 +++
lib/libc/arch/powerpc/gen/makecontext.c | 91 +++++
lib/libc/arch/powerpc/gen/resumecontext.c | 56 +++
lib/libc/arch/powerpc/gen/swapcontext.S | 66 ++++
lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/powerpc/sys/getcontext.S | 60 +++
lib/libc/arch/powerpc/sys/setlogin.S | 21 -
lib/libc/arch/sh3/gen/Makefile.inc | 9 +-
lib/libc/arch/sh3/gen/_lwp.c | 61 +++
lib/libc/arch/sh3/gen/makecontext.c | 78 ++++
lib/libc/arch/sh3/gen/resumecontext.c | 56 +++
lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/sh3/sys/getcontext.S | 55 +++
lib/libc/arch/sh3/sys/setlogin.S | 56 ---
lib/libc/arch/sparc/gen/Makefile.inc | 4 +-
lib/libc/arch/sparc/gen/_lwp.c | 74 ++++
lib/libc/arch/sparc/gen/getcontext.S | 61 +++
lib/libc/arch/sparc/gen/makecontext.c | 82 +++++
lib/libc/arch/sparc/gen/resumecontext.c | 56 +++
lib/libc/arch/sparc/gen/swapcontext.S | 63 +++
lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/sparc/sys/setlogin.S | 65 ----
lib/libc/arch/sparc64/gen/Makefile.inc | 6 +-
lib/libc/arch/sparc64/gen/_lwp.c | 74 ++++
lib/libc/arch/sparc64/gen/makecontext.c | 88 +++++
lib/libc/arch/sparc64/gen/resumecontext.c | 56 +++
lib/libc/arch/sparc64/gen/swapcontext.S | 63 +++
lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/arch/sparc64/sys/getcontext.S | 61 +++
lib/libc/arch/sparc64/sys/setlogin.S | 78 ----
lib/libc/arch/vax/sys/__sigaction14_sigtramp.c | 6 +-
lib/libc/gen/Lint_resumecontext.c | 14 +
lib/libc/gen/Lint_swapcontext.c | 18 +
lib/libc/gen/Makefile.inc | 3 +-
lib/libc/gen/_errno.c | 13 +-
lib/libc/gen/_lwp_makecontext.3 | 81 +++++
lib/libc/gen/execl.c | 6 +-
lib/libc/gen/execv.c | 6 +-
lib/libc/gen/execvp.c | 6 +-
lib/libc/gen/getlogin.c | 16 +-
lib/libc/gen/syslog.c | 6 +-
lib/libc/include/extern.h | 4 +-
lib/libc/include/namespace.h | 10 +-
lib/libc/include/reentrant.h | 186 ++++++++---
lib/libc/rpc/auth_unix.c | 6 +-
lib/libc/rpc/bindresvport.3 | 2 +-
lib/libc/rpc/bindresvport.c | 4 +-
lib/libc/rpc/clnt_bcast.c | 2 +-
lib/libc/rpc/clnt_dg.c | 26 +-
lib/libc/rpc/clnt_generic.c | 2 +-
lib/libc/rpc/clnt_raw.c | 10 +-
lib/libc/rpc/clnt_simple.c | 35 +-
lib/libc/rpc/clnt_vc.c | 41 +-
lib/libc/rpc/getnetconfig.3 | 2 +-
lib/libc/rpc/getnetconfig.c | 35 +-
lib/libc/rpc/getnetpath.3 | 2 +-
lib/libc/rpc/getnetpath.c | 2 +-
lib/libc/rpc/getrpcent.3 | 2 +-
lib/libc/rpc/getrpcport.3 | 2 +-
lib/libc/rpc/mt_misc.c | 168 ++++------
lib/libc/rpc/pmap_clnt.c | 4 +-
lib/libc/rpc/rpc.3 | 2 +-
lib/libc/rpc/rpc_clnt_auth.3 | 2 +-
lib/libc/rpc/rpc_clnt_calls.3 | 2 +-
lib/libc/rpc/rpc_clnt_create.3 | 2 +-
lib/libc/rpc/rpc_commondata.c | 6 +-
lib/libc/rpc/rpc_generic.c | 50 +-
lib/libc/rpc/rpc_internal.h | 2 +-
lib/libc/rpc/rpc_soc.3 | 2 +-
lib/libc/rpc/rpc_soc.c | 42 +-
lib/libc/rpc/rpc_svc_calls.3 | 2 +-
lib/libc/rpc/rpc_svc_create.3 | 2 +-
lib/libc/rpc/rpc_svc_err.3 | 2 +-
lib/libc/rpc/rpc_svc_reg.3 | 2 +-
lib/libc/rpc/rpc_xdr.3 | 2 +-
lib/libc/rpc/rpcb_clnt.c | 6 +-
lib/libc/rpc/rpcbind.3 | 2 +-
lib/libc/rpc/svc.c | 6 +-
lib/libc/rpc/svc_auth.c | 6 +-
lib/libc/rpc/svc_auth_unix.c | 4 +-
lib/libc/rpc/svc_dg.c | 6 +-
lib/libc/rpc/svc_generic.c | 4 +-
lib/libc/rpc/svc_raw.c | 6 +-
lib/libc/rpc/svc_run.c | 8 +-
lib/libc/rpc/svc_simple.c | 6 +-
lib/libc/rpc/svc_vc.c | 10 +-
lib/libc/rpc/xdr.3 | 2 +-
lib/libc/rpc/xdr.c | 4 +-
lib/libc/rpc/xdr_array.c | 4 +-
lib/libc/rpc/xdr_float.c | 4 +-
lib/libc/rpc/xdr_rec.c | 4 +-
lib/libc/shlib_version | 4 +-
lib/libc/stdio/Makefile.inc | 14 +-
lib/libc/stdio/asprintf.c | 8 +-
lib/libc/stdio/fclose.3 | 2 +-
lib/libc/stdio/fclose.c | 6 +-
lib/libc/stdio/fdopen.c | 5 +-
lib/libc/stdio/ferror.3 | 2 +-
lib/libc/stdio/fflush.3 | 2 +-
lib/libc/stdio/fflush.c | 8 +-
lib/libc/stdio/fgetln.3 | 2 +-
lib/libc/stdio/fgetln.c | 6 +-
lib/libc/stdio/fgets.3 | 2 +-
lib/libc/stdio/fgets.c | 6 +-
lib/libc/stdio/fgetwc.c | 4 +-
lib/libc/stdio/fileext.h | 22 +-
lib/libc/stdio/findfp.c | 15 +-
lib/libc/stdio/flags.c | 5 +-
lib/libc/stdio/flockfile.c | 159 ++++++++++
lib/libc/stdio/fopen.3 | 2 +-
lib/libc/stdio/fopen.c | 5 +-
lib/libc/stdio/fparseln.3 | 2 +-
lib/libc/stdio/fparseln.c | 4 +-
lib/libc/stdio/fprintf.c | 4 +-
lib/libc/stdio/fpurge.c | 6 +-
lib/libc/stdio/fputs.3 | 2 +-
lib/libc/stdio/fputs.c | 6 +-
lib/libc/stdio/fputwc.c | 4 +-
lib/libc/stdio/fread.3 | 2 +-
lib/libc/stdio/fread.c | 6 +-
lib/libc/stdio/freopen.c | 5 +-
lib/libc/stdio/fscanf.c | 5 +-
lib/libc/stdio/fseek.3 | 2 +-
lib/libc/stdio/fseek.c | 6 +-
lib/libc/stdio/fseeko.c | 6 +-
lib/libc/stdio/ftell.c | 6 +-
lib/libc/stdio/ftello.c | 6 +-
lib/libc/stdio/funopen.3 | 2 +-
lib/libc/stdio/funopen.c | 5 +-
lib/libc/stdio/fvwrite.c | 5 +-
lib/libc/stdio/fvwrite.h | 2 +-
lib/libc/stdio/fwalk.c | 5 +-
lib/libc/stdio/fwide.3 | 2 +-
lib/libc/stdio/fwide.c | 4 +-
lib/libc/stdio/fwrite.c | 6 +-
lib/libc/stdio/getc.3 | 2 +-
lib/libc/stdio/gettemp.c | 6 +-
lib/libc/stdio/getwc.3 | 2 +-
lib/libc/stdio/getwc.c | 2 +-
lib/libc/stdio/getwchar.c | 2 +-
lib/libc/stdio/local.h | 5 +-
lib/libc/stdio/makebuf.c | 5 +-
lib/libc/stdio/mkdtemp.c | 5 +-
lib/libc/stdio/mkstemp.c | 5 +-
lib/libc/stdio/mktemp.3 | 2 +-
lib/libc/stdio/mktemp.c | 5 +-
lib/libc/stdio/perror.3 | 2 +-
lib/libc/stdio/printf.3 | 2 +-
lib/libc/stdio/printf.c | 4 +-
lib/libc/stdio/putc.3 | 2 +-
lib/libc/stdio/putwc.3 | 2 +-
lib/libc/stdio/putwc.c | 2 +-
lib/libc/stdio/putwchar.c | 2 +-
lib/libc/stdio/refill.c | 8 +-
lib/libc/stdio/remove.3 | 2 +-
lib/libc/stdio/rget.c | 5 +-
lib/libc/stdio/scanf.3 | 2 +-
lib/libc/stdio/scanf.c | 5 +-
lib/libc/stdio/setbuf.3 | 2 +-
lib/libc/stdio/setbuf.c | 5 +-
lib/libc/stdio/setvbuf.c | 6 +-
lib/libc/stdio/snprintf.c | 7 +-
lib/libc/stdio/sprintf.c | 7 +-
lib/libc/stdio/sscanf.c | 7 +-
lib/libc/stdio/stdio.3 | 2 +-
lib/libc/stdio/stdio.c | 5 +-
lib/libc/stdio/tempnam.c | 5 +-
lib/libc/stdio/tmpfile.c | 4 +-
lib/libc/stdio/tmpnam.3 | 2 +-
lib/libc/stdio/tmpnam.c | 5 +-
lib/libc/stdio/ungetc.3 | 2 +-
lib/libc/stdio/ungetc.c | 6 +-
lib/libc/stdio/ungetwc.3 | 2 +-
lib/libc/stdio/ungetwc.c | 4 +-
lib/libc/stdio/vasprintf.c | 7 +-
lib/libc/stdio/vfprintf.c | 28 +-
lib/libc/stdio/vfscanf.c | 28 +-
lib/libc/stdio/vscanf.c | 5 +-
lib/libc/stdio/vsnprintf.c | 7 +-
lib/libc/stdio/vsprintf.c | 7 +-
lib/libc/stdio/vsscanf.c | 7 +-
lib/libc/stdio/wbuf.c | 5 +-
lib/libc/stdio/wcio.h | 2 +-
lib/libc/stdio/wsetup.c | 5 +-
lib/libc/stdlib/atexit.c | 6 +-
lib/libc/stdlib/atexit.h | 4 +-
lib/libc/stdlib/getenv.c | 6 +-
lib/libc/stdlib/malloc.c | 8 +-
lib/libc/stdlib/setenv.c | 6 +-
lib/libc/stdlib/strtod.c | 6 +-
lib/libc/sys/Lint___clone.c | 2 +-
lib/libc/sys/Lint___syscall.c | 2 +-
lib/libc/sys/Lint_clone.c | 2 +-
lib/libc/sys/Lint_getcontext.c | 17 +
lib/libc/sys/Lint_syscall.c | 2 +-
lib/libc/sys/Makefile.inc | 68 ++-
lib/libc/sys/__semctl13.c | 4 +-
lib/libc/sys/_exit.2 | 2 +-
lib/libc/sys/_getcontext.c | 47 ++
lib/libc/sys/_lwp_create.2 | 107 ++++++
lib/libc/sys/_lwp_exit.2 | 68 ++++
lib/libc/sys/_lwp_getprivate.2 | 75 ++++
lib/libc/sys/_lwp_self.2 | 63 +++
lib/libc/sys/_lwp_suspend.2 | 101 ++++++
lib/libc/sys/_lwp_wait.2 | 100 ++++++
lib/libc/sys/_lwp_wakeup.2 | 80 +++++
lib/libc/sys/_pipe.c | 2 +-
lib/libc/sys/accept.2 | 2 +-
lib/libc/sys/access.2 | 2 +-
lib/libc/sys/acct.2 | 2 +-
lib/libc/sys/adjtime.2 | 2 +-
lib/libc/sys/adjtime.c | 2 +-
lib/libc/sys/bind.2 | 2 +-
lib/libc/sys/brk.2 | 2 +-
lib/libc/sys/chdir.2 | 2 +-
lib/libc/sys/chflags.2 | 2 +-
lib/libc/sys/chmod.2 | 2 +-
lib/libc/sys/chown.2 | 2 +-
lib/libc/sys/chroot.2 | 2 +-
lib/libc/sys/clock_settime.2 | 2 +-
lib/libc/sys/clock_settime.c | 2 +-
lib/libc/sys/clone.2 | 2 +-
lib/libc/sys/close.2 | 2 +-
lib/libc/sys/connect.2 | 2 +-
lib/libc/sys/dup.2 | 2 +-
lib/libc/sys/execve.2 | 2 +-
lib/libc/sys/fcntl.2 | 2 +-
lib/libc/sys/fdatasync.2 | 2 +-
lib/libc/sys/fhopen.2 | 2 +-
lib/libc/sys/flock.2 | 2 +-
lib/libc/sys/fork.2 | 2 +-
lib/libc/sys/fsync.2 | 2 +-
lib/libc/sys/getcontext.2 | 144 +++++++++
lib/libc/sys/getdents.2 | 2 +-
lib/libc/sys/getdirentries.3 | 2 +-
lib/libc/sys/getfh.2 | 2 +-
lib/libc/sys/getfsstat.2 | 2 +-
lib/libc/sys/getgid.2 | 2 +-
lib/libc/sys/getgroups.2 | 2 +-
lib/libc/sys/getitimer.2 | 2 +-
lib/libc/sys/getlogin.2 | 2 +-
lib/libc/sys/getpeername.2 | 2 +-
lib/libc/sys/getpgrp.2 | 2 +-
lib/libc/sys/getpid.2 | 2 +-
lib/libc/sys/getpriority.2 | 2 +-
lib/libc/sys/getrlimit.2 | 2 +-
lib/libc/sys/getrusage.2 | 2 +-
lib/libc/sys/getsid.2 | 2 +-
lib/libc/sys/getsockname.2 | 2 +-
lib/libc/sys/getsockopt.2 | 2 +-
lib/libc/sys/gettimeofday.2 | 2 +-
lib/libc/sys/getuid.2 | 2 +-
lib/libc/sys/intro.2 | 2 +-
lib/libc/sys/ioctl.2 | 2 +-
lib/libc/sys/issetugid.2 | 2 +-
lib/libc/sys/kill.2 | 2 +-
lib/libc/sys/kqueue.2 | 2 +-
lib/libc/sys/ktrace.2 | 2 +-
lib/libc/sys/lfs_bmapv.2 | 2 +-
lib/libc/sys/lfs_markv.2 | 2 +-
lib/libc/sys/lfs_segclean.2 | 2 +-
lib/libc/sys/lfs_segwait.2 | 2 +-
lib/libc/sys/link.2 | 2 +-
lib/libc/sys/listen.2 | 2 +-
lib/libc/sys/lseek.2 | 2 +-
lib/libc/sys/madvise.2 | 2 +-
lib/libc/sys/makelintstub | 3 +-
lib/libc/sys/mincore.2 | 2 +-
lib/libc/sys/minherit.2 | 2 +-
lib/libc/sys/mkdir.2 | 2 +-
lib/libc/sys/mkfifo.2 | 2 +-
lib/libc/sys/mknod.2 | 2 +-
lib/libc/sys/mlock.2 | 2 +-
lib/libc/sys/mlockall.2 | 2 +-
lib/libc/sys/mmap.2 | 2 +-
lib/libc/sys/mount.2 | 2 +-
lib/libc/sys/mprotect.2 | 2 +-
lib/libc/sys/msgctl.2 | 2 +-
lib/libc/sys/msgget.2 | 2 +-
lib/libc/sys/msgrcv.2 | 2 +-
lib/libc/sys/msgsnd.2 | 2 +-
lib/libc/sys/msync.2 | 2 +-
lib/libc/sys/munmap.2 | 2 +-
lib/libc/sys/nanosleep.2 | 2 +-
lib/libc/sys/nfssvc.2 | 2 +-
lib/libc/sys/ntp_adjtime.2 | 2 +-
lib/libc/sys/ntp_adjtime.c | 2 +-
lib/libc/sys/open.2 | 2 +-
lib/libc/sys/pathconf.2 | 2 +-
lib/libc/sys/pipe.2 | 2 +-
lib/libc/sys/pmc_control.2 | 2 +-
lib/libc/sys/poll.2 | 2 +-
lib/libc/sys/pread.c | 11 +-
lib/libc/sys/profil.2 | 2 +-
lib/libc/sys/ptrace.2 | 2 +-
lib/libc/sys/pwrite.c | 11 +-
lib/libc/sys/quotactl.2 | 2 +-
lib/libc/sys/rasctl.2 | 2 +-
lib/libc/sys/read.2 | 2 +-
lib/libc/sys/readlink.2 | 2 +-
lib/libc/sys/reboot.2 | 2 +-
lib/libc/sys/recv.2 | 2 +-
lib/libc/sys/rename.2 | 2 +-
lib/libc/sys/revoke.2 | 2 +-
lib/libc/sys/rmdir.2 | 2 +-
lib/libc/sys/select.2 | 2 +-
lib/libc/sys/semctl.2 | 2 +-
lib/libc/sys/semctl.c | 4 +-
lib/libc/sys/semget.2 | 2 +-
lib/libc/sys/semop.2 | 2 +-
lib/libc/sys/send.2 | 2 +-
lib/libc/sys/setgroups.2 | 2 +-
lib/libc/sys/setpgid.2 | 2 +-
lib/libc/sys/setregid.2 | 2 +-
lib/libc/sys/setreuid.2 | 2 +-
lib/libc/sys/setsid.2 | 2 +-
lib/libc/sys/settimeofday.c | 2 +-
lib/libc/sys/setuid.2 | 2 +-
lib/libc/sys/shmat.2 | 2 +-
lib/libc/sys/shmctl.2 | 2 +-
lib/libc/sys/shmget.2 | 2 +-
lib/libc/sys/shutdown.2 | 2 +-
lib/libc/sys/sigaction.2 | 2 +-
lib/libc/sys/sigaltstack.2 | 2 +-
lib/libc/sys/sigpending.2 | 2 +-
lib/libc/sys/sigprocmask.2 | 2 +-
lib/libc/sys/sigreturn.2 | 2 +-
lib/libc/sys/sigstack.2 | 2 +-
lib/libc/sys/sigsuspend.2 | 2 +-
lib/libc/sys/socket.2 | 2 +-
lib/libc/sys/socketpair.2 | 2 +-
lib/libc/sys/stat.2 | 2 +-
lib/libc/sys/statfs.2 | 2 +-
lib/libc/sys/swapctl.2 | 2 +-
lib/libc/sys/swapon.3 | 2 +-
lib/libc/sys/symlink.2 | 2 +-
lib/libc/sys/sync.2 | 2 +-
lib/libc/sys/sysarch.2 | 2 +-
lib/libc/sys/syscall.2 | 2 +-
lib/libc/sys/timer_create.c | 17 -
lib/libc/sys/timer_delete.c | 15 -
lib/libc/sys/timer_getoverrun.c | 15 -
lib/libc/sys/timer_gettime.c | 16 -
lib/libc/sys/timer_settime.c | 18 -
lib/libc/sys/truncate.2 | 2 +-
lib/libc/sys/umask.2 | 2 +-
lib/libc/sys/undelete.2 | 2 +-
lib/libc/sys/unlink.2 | 2 +-
lib/libc/sys/utimes.2 | 2 +-
lib/libc/sys/utrace.2 | 2 +-
lib/libc/sys/vfork.2 | 2 +-
lib/libc/sys/wait.2 | 2 +-
lib/libc/sys/write.2 | 2 +-
lib/libc/thread-stub/Makefile.inc | 4 +-
lib/libc/thread-stub/pthread-stub.c | 137 --------
lib/libc/thread-stub/thread-stub.c | 333 +++++++++++++++++++++
usr.bin/systat/pigs.c | 6 +-
usr.bin/systat/ps.c | 28 +-
usr.bin/top/machine/m_netbsd15.c | 18 +-
usr.bin/w/proc_compare.c | 12 +-
411 files changed, 5888 insertions(+), 1687 deletions(-)
diffs (truncated from 13083 to 300 lines):
diff -r 9e82cdb03941 -r 31e9225f0467 bin/ps/extern.h
--- a/bin/ps/extern.h Sat Jan 18 10:32:11 2003 +0000
+++ b/bin/ps/extern.h Sat Jan 18 10:52:16 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.21 2002/06/19 08:11:55 jdolecek Exp $ */
+/* $NetBSD: extern.h,v 1.22 2003/01/18 10:52:16 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -43,49 +43,47 @@
extern double ccpu;
extern int eval, fscale, mempages, nlistread, rawcpu, maxslp, uspace;
extern int sumrusage, termwidth, totwidth;
-extern int needenv, needcomm, commandonly, dontuseprocfs;
+extern int needenv, needcomm, commandonly;
extern uid_t myuid;
extern kvm_t *kd;
extern VAR var[];
extern VARENT *vhead;
__BEGIN_DECLS
-void command __P((struct kinfo_proc2 *, VARENT *, int));
-void cputime __P((struct kinfo_proc2 *, VARENT *, int));
+void command __P((void *, VARENT *, int));
+void cputime __P((void *, VARENT *, int));
int donlist __P((void));
int donlist_sysctl __P((void));
void fmt_puts __P((char *, int *));
void fmt_putc __P((int, int *));
double getpcpu __P((struct kinfo_proc2 *));
double getpmem __P((struct kinfo_proc2 *));
-void logname __P((struct kinfo_proc2 *, VARENT *, int));
-void longtname __P((struct kinfo_proc2 *, VARENT *, int));
-void lstarted __P((struct kinfo_proc2 *, VARENT *, int));
-void maxrss __P((struct kinfo_proc2 *, VARENT *, int));
+void logname __P((void *, VARENT *, int));
+void longtname __P((void *, VARENT *, int));
+void lstarted __P((void *, VARENT *, int));
+void lstate __P((void *, VARENT *, int));
+void maxrss __P((void *, VARENT *, int));
void nlisterr __P((struct nlist *));
-void p_rssize __P((struct kinfo_proc2 *, VARENT *, int));
-void pagein __P((struct kinfo_proc2 *, VARENT *, int));
+void p_rssize __P((void *, VARENT *, int));
+void pagein __P((void *, VARENT *, int));
void parsefmt __P((char *));
-void pcpu __P((struct kinfo_proc2 *, VARENT *, int));
-void pmem __P((struct kinfo_proc2 *, VARENT *, int));
-void pnice __P((struct kinfo_proc2 *, VARENT *, int));
-void pri __P((struct kinfo_proc2 *, VARENT *, int));
+void pcpu __P((void *, VARENT *, int));
+void pmem __P((void *, VARENT *, int));
+void pnice __P((void *, VARENT *, int));
+void pri __P((void *, VARENT *, int));
void printheader __P((void));
-struct kinfo_proc2
- *getkinfo_procfs __P((int, int, int *));
-char **procfs_getargv __P((const struct kinfo_proc2 *, int));
-void pvar __P((struct kinfo_proc2 *, VARENT *, int));
-void rssize __P((struct kinfo_proc2 *, VARENT *, int));
-void runame __P((struct kinfo_proc2 *, VARENT *, int));
+void pvar __P((void *, VARENT *, int));
+void rssize __P((void *, VARENT *, int));
+void runame __P((void *, VARENT *, int));
void showkey __P((void));
-void started __P((struct kinfo_proc2 *, VARENT *, int));
-void state __P((struct kinfo_proc2 *, VARENT *, int));
-void tdev __P((struct kinfo_proc2 *, VARENT *, int));
-void tname __P((struct kinfo_proc2 *, VARENT *, int));
-void tsize __P((struct kinfo_proc2 *, VARENT *, int));
-void ucomm __P((struct kinfo_proc2 *, VARENT *, int));
-void uname __P((struct kinfo_proc2 *, VARENT *, int));
-void uvar __P((struct kinfo_proc2 *, VARENT *, int));
-void vsize __P((struct kinfo_proc2 *, VARENT *, int));
-void wchan __P((struct kinfo_proc2 *, VARENT *, int));
+void started __P((void *, VARENT *, int));
+void state __P((void *, VARENT *, int));
+void tdev __P((void *, VARENT *, int));
+void tname __P((void *, VARENT *, int));
+void tsize __P((void *, VARENT *, int));
+void ucomm __P((void *, VARENT *, int));
+void uname __P((void *, VARENT *, int));
+void uvar __P((void *, VARENT *, int));
+void vsize __P((void *, VARENT *, int));
+void wchan __P((void *, VARENT *, int));
__END_DECLS
diff -r 9e82cdb03941 -r 31e9225f0467 bin/ps/keyword.c
--- a/bin/ps/keyword.c Sat Jan 18 10:32:11 2003 +0000
+++ b/bin/ps/keyword.c Sat Jan 18 10:52:16 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: keyword.c,v 1.28 2002/10/17 23:50:17 itojun Exp $ */
+/* $NetBSD: keyword.c,v 1.29 2003/01/18 10:52:16 thorpej Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -38,12 +38,13 @@
#if 0
static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: keyword.c,v 1.28 2002/10/17 23:50:17 itojun Exp $");
+__RCSID("$NetBSD: keyword.c,v 1.29 2003/01/18 10:52:16 thorpej Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
#include <sys/time.h>
+#include <sys/lwp.h>
#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/sysctl.h>
@@ -73,6 +74,7 @@
/* Compute offset in common structures. */
#define POFF(x) offsetof(struct kinfo_proc2, x)
+#define LOFF(x) offsetof(struct kinfo_lwp, x)
#define UIDFMT "u"
#define UID(n1, n2, fn, off) \
@@ -95,7 +97,7 @@
{"cputime", "", "time"},
{"f", "F", NULL, 0, pvar, 0, POFF(p_flag), INT, "x"},
{"flags", "", "f"},
- {"holdcnt", "HOLDCNT", NULL, 0, pvar, 0, POFF(p_holdcnt), INT, "d"},
+ {"holdcnt", "HOLDCNT", NULL, LWP, pvar, 0, LOFF(l_holdcnt), INT, "d"},
{"ignored", "", "sigignore"},
{"inblk", "INBLK", NULL, 0, pvar, 0, POFF(p_uru_inblock), UINT64, "llu"},
{"inblock", "", "inblk"},
@@ -103,10 +105,12 @@
{"ktrace", "KTRACE", NULL, 0, pvar, 0, POFF(p_traceflag), INT, "x"},
/* XXX */
{"ktracep", "KTRACEP", NULL, 0, pvar, 0, POFF(p_tracep), KPTR, "llx"},
+ {"lid", "LID", NULL, LWP, pvar, 0, LOFF(l_lid), ULONG, "d"},
{"lim", "LIM", NULL, 0, maxrss},
{"login", "LOGIN", NULL, LJUST, logname},
{"logname", "", "login"},
{"lstart", "STARTED", NULL, LJUST, lstarted},
+ {"lstate", "STAT", NULL, LJUST|LWP, lstate},
{"majflt", "MAJFLT", NULL, 0, pvar, 0, POFF(p_uru_majflt), UINT64, "llu"},
{"minflt", "MINFLT", NULL, 0, pvar, 0, POFF(p_uru_minflt), UINT64, "llu"},
{"msgrcv", "MSGRCV", NULL, 0, pvar, 0, POFF(p_uru_msgrcv), UINT64, "llu"},
@@ -114,12 +118,13 @@
{"ni", "", "nice"},
{"nice", "NI", NULL, 0, pnice},
{"nivcsw", "NIVCSW", NULL, 0, pvar, 0, POFF(p_uru_nivcsw), UINT64, "llu"},
+ {"nlwp", "NLWP", NULL, 0, pvar, 0, POFF(p_nlwps), UINT64, "lld"},
{"nsignals", "", "nsigs"},
{"nsigs", "NSIGS", NULL, 0, pvar, 0, POFF(p_uru_nsignals), UINT64, "llu"},
{"nswap", "NSWAP", NULL, 0, pvar, 0, POFF(p_uru_nswap), UINT64, "llu"},
{"nvcsw", "NVCSW", NULL, 0, pvar, 0, POFF(p_uru_nvcsw), UINT64, "llu"},
/* XXX */
- {"nwchan", "WCHAN", NULL, 0, pvar, 0, POFF(p_wchan), KPTR, "llx"},
+ {"nwchan", "WCHAN", NULL, LWP, pvar, 0, LOFF(l_wchan), KPTR, "llx"},
{"oublk", "OUBLK", NULL, 0, pvar, 0, POFF(p_uru_oublock), UINT64, "llu"},
{"oublock", "", "oublk"},
/* XXX */
@@ -133,11 +138,12 @@
PID("pid", "PID", pvar, POFF(p_pid)),
{"pmem", "", "%mem"},
PID("ppid", "PPID", pvar, POFF(p_ppid)),
- {"pri", "PRI", NULL, 0, pri},
- {"re", "RE", NULL, INF127, pvar, 0, POFF(p_swtime), UINT, "u"},
+ {"pri", "PRI", NULL, LWP, pri},
+ {"re", "RE", NULL, INF127|LWP, pvar, 0, LOFF(l_swtime), UINT, "u"},
GID("rgid", "RGID", pvar, POFF(p_rgid)),
/* XXX */
- {"rlink", "RLINK", NULL, 0, pvar, 0, POFF(p_back), KPTR, "llx"},
+ {"rlink", "RLINK", NULL, LWP, pvar, 0, LOFF(l_back), KPTR, "llx"},
+ {"rlwp", "RLWP", NULL, 0, pvar, 0, POFF(p_nrlwps), UINT64, "lld"},
{"rss", "RSS", NULL, 0, p_rssize},
{"rssize", "", "rsz"},
{"rsz", "RSZ", NULL, 0, rssize},
@@ -153,7 +159,7 @@
NULL, 0, pvar, 0, POFF(p_sigignore), SIGLIST, "s"},
{"sigmask", "BLOCKED",
NULL, 0, pvar, 0, POFF(p_sigmask), SIGLIST, "s"},
- {"sl", "SL", NULL, INF127, pvar, 0, POFF(p_slptime), UINT, "u"},
+ {"sl", "SL", NULL, INF127|LWP, pvar, 0, LOFF(l_slptime), UINT, "u"},
{"start", "STARTED", NULL, 0, started},
{"stat", "", "state"},
{"state", "STAT", NULL, LJUST, state},
@@ -168,12 +174,12 @@
{"tty", "TTY", NULL, LJUST, longtname},
{"ucomm", "UCOMM", NULL, LJUST, ucomm},
UID("uid", "UID", pvar, POFF(p_uid)),
- {"upr", "UPR", NULL, 0, pvar, 0, POFF(p_usrpri), UCHAR, "u"},
+ {"upr", "UPR", NULL, LWP, pvar, 0, LOFF(l_usrpri), UCHAR, "u"},
{"user", "USER", NULL, LJUST, uname},
{"usrpri", "", "upr"},
{"vsize", "", "vsz"},
{"vsz", "VSZ", NULL, 0, vsize},
- {"wchan", "WCHAN", NULL, LJUST, wchan},
+ {"wchan", "WCHAN", NULL, LJUST|LWP, wchan},
{"xstat", "XSTAT", NULL, 0, pvar, 0, POFF(p_xstat), USHORT, "x"},
{""},
};
diff -r 9e82cdb03941 -r 31e9225f0467 bin/ps/nlist.c
--- a/bin/ps/nlist.c Sat Jan 18 10:32:11 2003 +0000
+++ b/bin/ps/nlist.c Sat Jan 18 10:52:16 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist.c,v 1.18 2001/07/14 06:53:44 matt Exp $ */
+/* $NetBSD: nlist.c,v 1.19 2003/01/18 10:52:17 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -74,12 +74,13 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: nlist.c,v 1.18 2001/07/14 06:53:44 matt Exp $");
+__RCSID("$NetBSD: nlist.c,v 1.19 2003/01/18 10:52:17 thorpej Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
#include <sys/time.h>
+#include <sys/lwp.h>
#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/sysctl.h>
diff -r 9e82cdb03941 -r 31e9225f0467 bin/ps/print.c
--- a/bin/ps/print.c Sat Jan 18 10:32:11 2003 +0000
+++ b/bin/ps/print.c Sat Jan 18 10:52:16 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.75 2003/01/06 13:04:54 wiz Exp $ */
+/* $NetBSD: print.c,v 1.76 2003/01/18 10:52:17 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -74,13 +74,14 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: print.c,v 1.75 2003/01/06 13:04:54 wiz Exp $");
+__RCSID("$NetBSD: print.c,v 1.76 2003/01/18 10:52:17 thorpej Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
+#include <sys/lwp.h>
#include <sys/proc.h>
#include <sys/stat.h>
#include <sys/ucred.h>
@@ -264,11 +265,12 @@
}
void
-command(ki, ve, mode)
- struct kinfo_proc2 *ki;
+command(arg, ve, mode)
+ void *arg;
VARENT *ve;
int mode;
{
+ struct kinfo_proc2 *ki;
VAR *v;
int left;
char **argv, **p, *name;
@@ -276,6 +278,7 @@
if (mode == WIDTHMODE)
return;
+ ki = arg;
v = ve->var;
if (ve->next != NULL || termwidth != UNLIMITED) {
if (ve->next == NULL) {
@@ -343,40 +346,46 @@
}
void
-ucomm(k, ve, mode)
- struct kinfo_proc2 *k;
+ucomm(arg, ve, mode)
+ void *arg;
VARENT *ve;
int mode;
{
+ struct kinfo_proc2 *k;
VAR *v;
+ k = arg;
v = ve->var;
strprintorsetwidth(v, k->p_comm, mode);
}
void
-logname(k, ve, mode)
- struct kinfo_proc2 *k;
+logname(arg, ve, mode)
+ void *arg;
VARENT *ve;
int mode;
{
+ struct kinfo_proc2 *k;
VAR *v;
+ k = arg;
v = ve->var;
strprintorsetwidth(v, k->p_login, mode);
Home |
Main Index |
Thread Index |
Old Index