Index: head/bin/ps/ps.1 =================================================================== --- head/bin/ps/ps.1 (revision 127148) +++ head/bin/ps/ps.1 (revision 127149) @@ -1,558 +1,561 @@ .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" .Dd April 18, 1994 .Dt PS 1 .Os .Sh NAME .Nm ps .Nd process status .Sh SYNOPSIS .Nm .Op Fl aCcefHhjlmrSTuvwxZ .Op Fl M Ar core .Op Fl N Ar system .Op Fl O Ar fmt .Op Fl o Ar fmt -.Op Fl p Ar pid +.Oo Fl p Ar pid Ns Xo +.Op , Ns Ar pid Ns No ... +.Xc +.Oc .Op Fl t Ar tty .Oo Fl U Ar username Ns Xo .Op , Ns Ar username Ns No ... .Xc .Oc .Nm .Op Fl L .Sh DESCRIPTION The .Nm utility displays a header line followed by lines containing information about your processes that have controlling terminals. This information is sorted by controlling terminal, then by process .Tn ID . .Pp The information displayed is selected based on a set of keywords (see the .Fl L .Fl O and .Fl o options). The default output format includes, for each process, the process' .Tn ID , controlling terminal, cpu time (including both user and system time), state, and associated command. .Pp The process file system (see .Xr procfs 5 ) should be mounted when .Nm is executed, otherwise not all information will be available. .Pp The options are as follows: .Bl -tag -width indent .It Fl a Display information about other users' processes as well as your own. This can be disabled by setting the .Va security.bsd.see_other_uids sysctl to zero. .It Fl c Change the ``command'' column output to just contain the executable name, rather than the full command line. .It Fl C Change the way the cpu percentage is calculated by using a ``raw'' cpu calculation that ignores ``resident'' time (this normally has no effect). .It Fl e Display the environment as well. .It Fl f Show commandline and environment information about swapped out processes. This option is honored only if the uid of the user is 0. .It Fl H Show all of the .Em kernel visible threads associated with each process. Depending on the threading package that is in use, this may show only the process, only the kernel scheduled entities, or all of the process threads. .It Fl h Repeat the information header as often as necessary to guarantee one header per page of information. .It Fl j Print information associated with the following keywords: user, pid, ppid, pgid, jobc, state, tt, time and command. .It Fl L List the set of available keywords. .It Fl l Display information associated with the following keywords: uid, pid, ppid, cpu, pri, nice, vsz, rss, mwchan, state, tt, time and command. .It Fl M Extract values associated with the name list from the specified core instead of the default .Pa /dev/kmem . .It Fl m Sort by memory usage, instead of by process .Tn ID . .It Fl N Extract the name list from the specified system instead of the default .Pa /boot/kernel/kernel . .It Fl O Add the information associated with the space or comma separated list of keywords specified, after the process .Tn ID , in the default information display. Keywords may be appended with an equals (``='') sign and a string. This causes the printed header to use the specified string instead of the standard header. .It Fl o Display information associated with the space or comma separated list of keywords specified. Multiple keywords may also be given in the form of more than one .Fl o option. Keywords may be appended with an equals (``='') sign and a string. This causes the printed header to use the specified string instead of the standard header. .It Fl p Display information associated with the specified process -.Tn ID . +.Tn ID(s) . .It Fl r Sort by current cpu usage, instead of by process .Tn ID . .It Fl S Change the way the process time is calculated by summing all exited children to their parent process. .It Fl T Display information about processes attached to the device associated with the standard input. .It Fl t Display information about processes attached to the specified terminal device. .It Fl U Display the processes belonging to the specified .Ar username Ns (s) . .It Fl u Display information associated with the following keywords: user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command. The .Fl u option implies the .Fl r option. .It Fl v Display information associated with the following keywords: pid, state, time, sl, re, pagein, vsz, rss, lim, tsiz, %cpu, %mem and command. The .Fl v option implies the .Fl m option. .It Fl w Use 132 columns to display information, instead of the default which is your window size. If the .Fl w option is specified more than once, .Nm will use as many columns as necessary without regard for your window size. .It Fl x Display information about processes without controlling terminals. .It Fl Z Add label to the list of keywords for which .Nm will display information. .El .Pp A complete list of the available keywords are listed below. Some of these keywords are further specified as follows: .Bl -tag -width lockname .It %cpu The cpu utilization of the process; this is a decaying average over up to a minute of previous (real) time. Since the time base over which this is computed varies (since processes may be very young) it is possible for the sum of all .Tn \&%CPU fields to exceed 100%. .It %mem The percentage of real memory used by this process. .It flags The flags associated with the process as in the include file .In sys/proc.h : .Bl -column P_STOPPED_SINGLE 0x4000000 .It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock" .It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal" .It Dv "P_KTHREAD" Ta No "0x00004 Kernel thread" .It Dv "P_NOLOAD" Ta No "0x00008 Ignore during load avg calculations" .It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit" .It Dv "P_PROFIL" Ta No "0x00020 Has started profiling" .It Dv "P_STOPPROF" Ta No "0x00040 Has thread in requesting to stop prof" .It Dv "P_SUGID" Ta No "0x00100 Had set id privileges since last exec" .It Dv "P_SYSTEM" Ta No "0x00200 System proc: no sigs, stats or swapping" .It Dv "P_SINGLE_EXIT" Ta No "0x00400 Threads suspending should exit, not wait" .It Dv "P_TRACED" Ta No "0x00800 Debugged process being traced" .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" .It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" .It Dv "P_STOPPED_SINGLE" Ta No "0x80000 Only one thread can continue" .It Dv "P_PROTECTED" Ta No "0x100000 Do not kill on memory overcommit" .It Dv "P_SIGEVENT" Ta No "0x200000 Process pending signals changed" .It Dv "P_JAILED" Ta No "0x1000000 Process is in jail" .It Dv "P_INEXEC" Ta No "0x4000000 Process is in execve()" .El .It label The MAC label of the process. .It lim The soft limit on memory used, specified via a call to .Xr setrlimit 2 . .It lstart The exact time the command started, using the ``%c'' format described in .Xr strftime 3 . .It lockname The name of the lock that the process is currently blocked on. If the name is invalid or unknown, then .Dq ???\& is displayed. .It mwchan The event name if the process is blocked normally, or the lock name if the process is blocked on a lock. See the wchan and lockname keywords for details. .It nice The process scheduling increment (see .Xr setpriority 2 ) . .It rss the real memory (resident set) size of the process (in 1024 byte units). .It start The time the command started. If the command started less than 24 hours ago, the start time is displayed using the ``%l:ps.1p'' format described in .Xr strftime 3 . If the command started less than 7 days ago, the start time is displayed using the ``%a6.15p'' format. Otherwise, the start time is displayed using the ``%e%b%y'' format. .It state The state is given by a sequence of characters, for example, .Dq Tn RWNA . The first character indicates the run state of the process: .Pp .Bl -tag -width indent -compact .It D Marks a process in disk (or other short term, uninterruptible) wait. .It I Marks a process that is idle (sleeping for longer than about 20 seconds). .It L Marks a process that is waiting to acquire a lock. .It R Marks a runnable process. .It S Marks a process that is sleeping for less than about 20 seconds. .It T Marks a stopped process. .It W Marks an idle interrupt thread. .It Z Marks a dead process (a ``zombie''). .El .Pp Additional characters after these, if any, indicate additional state information: .Pp .Bl -tag -width indent -compact .It + The process is in the foreground process group of its control terminal. .It < The process has raised .Tn CPU scheduling priority. .It E The process is trying to exit. .It J Marks a process which is in .Xr jail 2 . The hostname of the prison can be found in .Ql /proc//status . .It L The process has pages locked in core (for example, for raw .Tn I/O ) . .It N The process has reduced .Tn CPU scheduling priority (see .Xr setpriority 2 ) . .It s The process is a session leader. .It V The process is suspended during a .Xr vfork 2 . .It W The process is swapped out. .It X The process is being traced or debugged. .El .It tt An abbreviation for the pathname of the controlling terminal, if any. The abbreviation consists of the three letters following .Pa /dev/tty , or, for the console, ``con''. This is followed by a ``-'' if the process can no longer reach that controlling terminal (i.e., it has been revoked). .It wchan The event (an address in the system) on which a process waits. When printed numerically, the initial part of the address is trimmed off and the result is printed in hex, for example, 0x80324000 prints as 324000. .El .Pp When printing using the command keyword, a process that has exited and has a parent that has not yet waited for the process (in other words, a zombie) is listed as ``'', and a process which is blocked while trying to exit is listed as ``''. The .Nm utility makes an educated guess as to the file name and arguments given when the process was created by examining memory or the swap area. The method is inherently somewhat unreliable and in any event a process is entitled to destroy this information, so the names cannot be depended on too much. The ucomm (accounting) keyword can, however, be depended on. .Sh KEYWORDS The following is a complete list of the available keywords and their meanings. Several of them have aliases (keywords which are synonyms). .Pp .Bl -tag -width sigignore -compact .It %cpu percentage cpu usage (alias pcpu) .It %mem percentage memory usage (alias pmem) .It acflag accounting flag (alias acflg) .It args command and arguments .It comm command .It command command and arguments .It cpu short-term cpu usage factor (for scheduling) .It etime elapsed running time .It flags the process flags, in hexadecimal (alias f) .It inblk total blocks read (alias inblock) .It jobc job control count .It ktrace tracing flags .It label MAC label .It lim memoryuse limit .It logname login name of user who started the process .It lstart time started .It majflt total page faults .It minflt total page reclaims .It msgrcv total messages received (reads from pipes/sockets) .It msgsnd total messages sent (writes on pipes/sockets) .It lockname lock currently blocked on (as a symbolic name) .It mwchan wait channel or lock currently blocked on .It nice nice value (alias ni) .It nivcsw total involuntary context switches .It nsigs total signals taken (alias nsignals) .It nswap total swaps in/out .It nvcsw total voluntary context switches .It nwchan wait channel (as an address) .It oublk total blocks written (alias oublock) .It paddr swap address .It pagein pageins (same as majflt) .It pgid process group number .It pid process .Tn ID .It poip pageouts in progress .It ppid parent process .Tn ID .It pri scheduling priority .It re core residency time (in seconds; 127 = infinity) .It rgid real group .Tn ID .It rgroup group name (from rgid) .It rlink reverse link on run queue, or 0 .It rss resident set size .It rtprio realtime priority (101 = not a realtime process) .It ruid real user .Tn ID .It ruser user name (from ruid) .It sid session .Tn ID .It sig pending signals (alias pending) .It sigcatch caught signals (alias caught) .It sigignore ignored signals (alias ignored) .It sigmask blocked signals (alias blocked) .It sl sleep time (in seconds; 127 = infinity) .It start time started .It state symbolic process state (alias stat) .It svgid saved gid from a setgid executable .It svuid saved uid from a setuid executable .It tdev control terminal device number .It time accumulated cpu time, user + system (alias cputime) .It tpgid control terminal process group .Tn ID .\".It trss .\"text resident set size (in Kbytes) .It tsid control terminal session .Tn ID .It tsiz text size (in Kbytes) .It tt control terminal name (two letter abbreviation) .It tty full name of control terminal .It uprocp process pointer .It ucomm name to be used for accounting .It uid effective user .Tn ID .It upr scheduling priority on return from system call (alias usrpri) .It user user name (from uid) .It vsz virtual size in Kbytes (alias vsize) .It wchan wait channel (as a symbolic name) .It xstat exit or stop status (valid only for stopped or zombie process) .El .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : .Bl -tag -width ".Ev COLUMNS" .It Ev COLUMNS If set, specifies the user's preferred output width in column positions. By default, .Nm attempts to automatically determine the terminal width. .El .Sh FILES .Bl -tag -width /var/db/kvm_kernel.db -compact .It Pa /dev/kmem default kernel memory .It Pa /dev/lomac interface used to query the .Xr lomac 4 KLD .It Pa /var/run/dev.db /dev name database .It Pa /var/db/kvm_kernel.db system namelist database .It Pa /boot/kernel/kernel default system namelist .It Pa /proc the mount point of .Xr procfs 5 .El .Sh SEE ALSO .Xr kill 1 , .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , .Xr lomac 4 , .Xr procfs 5 , .Xr pstat 8 , .Xr sysctl 8 , .Xr mutex 9 .Sh HISTORY The .Nm command appeared in .At v4 . .Sh BUGS Since .Nm cannot run faster than the system and is run as any other scheduled process, the information it displays can never be exact. Index: head/bin/ps/ps.c =================================================================== --- head/bin/ps/ps.c (revision 127148) +++ head/bin/ps/ps.c (revision 127149) @@ -1,676 +1,756 @@ /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #if 0 #ifndef lint static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include +#include #include #include #include #include #include #include #include #include #include #include #include "ps.h" #define SEP ", \t" /* username separators */ static KINFO *kinfo; struct varent *vhead; int eval; /* exit value */ int cflag; /* -c */ int rawcpu; /* -C */ int sumrusage; /* -S */ int termwidth; /* width of screen (0 == infinity) */ int totwidth; /* calculated width of requested variables */ time_t now; /* current time(3) value */ static int needuser, needcomm, needenv; #if defined(LAZY_PS) static int forceuread=0; #else static int forceuread=1; #endif static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT; static const char *fmt(char **(*)(kvm_t *, const struct kinfo_proc *, int), KINFO *, char *, int); static char *kludge_oldps_options(char *); static int pscomp(const void *, const void *); static void saveuser(KINFO *); static void scanvars(void); static void dynsizevars(KINFO *); static void sizevars(void); static void usage(void); +static pid_t *getpids(const char *, int *); static uid_t *getuids(const char *, int *); static char dfmt[] = "pid,tt,state,time,command"; static char jfmt[] = "user,pid,ppid,pgid,jobc,state,tt,time,command"; static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state,tt,time,command"; static char o1[] = "pid"; static char o2[] = "tt,state,time,command"; static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; static char Zfmt[] = "label"; static kvm_t *kd; #if defined(LAZY_PS) #define PS_ARGS "aCcefgHhjLlM:mN:O:o:p:rSTt:U:uvwxZ" #else #define PS_ARGS "aCcegHhjLlM:mN:O:o:p:rSTt:U:uvwxZ" #endif int main(int argc, char *argv[]) { struct kinfo_proc *kp; struct varent *vent; struct winsize ws; dev_t ttydev; - pid_t pid; + pid_t *pids; uid_t *uids; int all, ch, flag, i, _fmt, lineno, nentries, nocludge, dropgid; - int prtheader, wflag, what, xflg, uid, nuids, showthreads; + int prtheader, wflag, what, xflg, pid, uid, npids, nuids, showthreads; char *cols; char errbuf[_POSIX2_LINE_MAX]; const char *cp, *nlistf, *memf; (void) setlocale(LC_ALL, ""); /* Set the time to what it is right now. */ time(&now); if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') termwidth = atoi(cols); else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || ws.ws_col == 0) termwidth = 79; else termwidth = ws.ws_col - 1; /* * Don't apply a kludge if the first argument is an option taking an * argument */ if (argc > 1) { nocludge = 0; if (argv[1][0] == '-') { for (cp = PS_ARGS; *cp != '\0'; cp++) { if (*cp != ':') continue; if (*(cp - 1) == argv[1][1]) { nocludge = 1; break; } } } if (nocludge == 0) argv[1] = kludge_oldps_options(argv[1]); } all = _fmt = prtheader = wflag = xflg = 0; - pid = -1; - nuids = 0; - uids = NULL; + npids = nuids = 0; + pids = uids = NULL; ttydev = NODEV; dropgid = 0; memf = nlistf = _PATH_DEVNULL; showthreads = 0; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch((char)ch) { case 'a': all = 1; break; case 'C': rawcpu = 1; break; case 'c': cflag = 1; break; case 'e': /* XXX set ufmt */ needenv = 1; break; case 'g': break; /* no-op */ case 'H': showthreads = KERN_PROC_INC_THREAD; break; case 'h': prtheader = ws.ws_row > 5 ? ws.ws_row : 22; break; case 'j': parsefmt(jfmt, 0); _fmt = 1; jfmt[0] = '\0'; break; case 'L': showkey(); exit(0); case 'l': parsefmt(lfmt, 0); _fmt = 1; lfmt[0] = '\0'; break; case 'M': memf = optarg; dropgid = 1; break; case 'm': sortby = SORTMEM; break; case 'N': nlistf = optarg; dropgid = 1; break; case 'O': parsefmt(o1, 1); parsefmt(optarg, 1); parsefmt(o2, 1); o1[0] = o2[0] = '\0'; _fmt = 1; break; case 'o': parsefmt(optarg, 1); _fmt = 1; break; #if defined(LAZY_PS) case 'f': if (getuid() == 0 || getgid() == 0) forceuread = 1; break; #endif case 'p': - pid = atol(optarg); + pids = getpids(optarg, &npids); xflg = 1; break; case 'r': sortby = SORTCPU; break; case 'S': sumrusage = 1; break; case 'T': if ((optarg = ttyname(STDIN_FILENO)) == NULL) errx(1, "stdin: not a terminal"); /* FALLTHROUGH */ case 't': { struct stat sb; char *ttypath, pathbuf[PATH_MAX]; if (strcmp(optarg, "co") == 0) ttypath = strdup(_PATH_CONSOLE); else if (*optarg != '/') (void)snprintf(ttypath = pathbuf, sizeof(pathbuf), "%s%s", _PATH_TTY, optarg); else ttypath = optarg; if (stat(ttypath, &sb) == -1) err(1, "%s", ttypath); if (!S_ISCHR(sb.st_mode)) errx(1, "%s: not a terminal", ttypath); ttydev = sb.st_rdev; break; } case 'U': uids = getuids(optarg, &nuids); xflg++; /* XXX: intuitive? */ break; case 'u': parsefmt(ufmt, 0); sortby = SORTCPU; _fmt = 1; ufmt[0] = '\0'; break; case 'v': parsefmt(vfmt, 0); sortby = SORTMEM; _fmt = 1; vfmt[0] = '\0'; break; case 'w': if (wflag) termwidth = UNLIMITED; else if (termwidth < 131) termwidth = 131; wflag++; break; case 'x': xflg = 1; break; case 'Z': parsefmt(Zfmt, 0); Zfmt[0] = '\0'; break; case '?': default: usage(); } argc -= optind; argv += optind; #define BACKWARD_COMPATIBILITY #ifdef BACKWARD_COMPATIBILITY if (*argv) { nlistf = *argv; if (*++argv) { memf = *argv; } } #endif /* * Discard setgid privileges if not the running kernel so that bad * guys can't print interesting stuff from kernel memory. */ if (dropgid) { setgid(getgid()); setuid(getuid()); } kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); if (kd == 0) errx(1, "%s", errbuf); if (!_fmt) parsefmt(dfmt, 0); /* XXX - should be cleaner */ - if (!all && ttydev == NODEV && pid == -1 && !nuids) { + if (!all && ttydev == NODEV && !npids && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) errx(1, "malloc failed"); nuids = 1; *uids = getuid(); } /* * scan requested variables, noting what structures are needed, * and adjusting header widths as appropriate. */ scanvars(); /* * get proc list */ if (nuids == 1) { what = KERN_PROC_UID | showthreads; flag = *uids; } else if (ttydev != NODEV) { what = KERN_PROC_TTY | showthreads; flag = ttydev; - } else if (pid != -1) { + } else if (npids == 1) { what = KERN_PROC_PID | showthreads; - flag = pid; + flag = *pids; } else { what = showthreads != 0 ? KERN_PROC_ALL : KERN_PROC_PROC; flag = 0; } /* * select procs */ - if ((kp = kvm_getprocs(kd, what, flag, &nentries)) == 0 || nentries < 0) + kp = kvm_getprocs(kd, what, flag, &nentries); + if ((kp == 0 && nentries != 0) || nentries < 0) errx(1, "%s", kvm_geterr(kd)); - if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) - errx(1, "malloc failed"); - for (i = nentries; --i >= 0; ++kp) { - kinfo[i].ki_p = kp; - if (needuser) - saveuser(&kinfo[i]); - dynsizevars(&kinfo[i]); + if (nentries > 0) { + if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) + errx(1, "malloc failed"); + for (i = nentries; --i >= 0; ++kp) { + kinfo[i].ki_p = kp; + if (needuser) + saveuser(&kinfo[i]); + dynsizevars(&kinfo[i]); + } } sizevars(); /* * print header */ printheader(); if (nentries == 0) exit(1); /* * sort proc list */ qsort(kinfo, nentries, sizeof(KINFO), pscomp); /* * for each proc, call each variable output function. */ for (i = lineno = 0; i < nentries; i++) { if (xflg == 0 && ((&kinfo[i])->ki_p->ki_tdev == NODEV || ((&kinfo[i])->ki_p->ki_flag & P_CONTROLT ) == 0)) continue; + if (npids > 1) { + for (pid = 0; pid < npids; pid++) + if ((&kinfo[i])->ki_p->ki_pid == pids[pid]) + break; + if (pid == npids) + continue; + } if (nuids > 1) { for (uid = 0; uid < nuids; uid++) if ((&kinfo[i])->ki_p->ki_uid == uids[uid]) break; if (uid == nuids) continue; } for (vent = vhead; vent; vent = vent->next) { (vent->var->oproc)(&kinfo[i], vent); if (vent->next != NULL) (void)putchar(' '); } (void)putchar('\n'); if (prtheader && lineno++ == prtheader - 4) { (void)putchar('\n'); printheader(); lineno = 0; } } free(uids); exit(eval); } +#define BSD_PID_MAX 99999 /* Copy of PID_MAX from sys/proc.h */ +pid_t * +getpids(const char *arg, int *npids) +{ + char copyarg[32]; + char *copyp, *endp; + pid_t *pids, *morepids; + int alloc; + long tempid; + + alloc = 0; + *npids = 0; + pids = NULL; + while (*arg != '\0') { + while (*arg != '\0' && strchr(SEP, *arg) != NULL) + arg++; + if (*arg == '\0' || strchr(SEP, *arg) != NULL) + tempid = 0; + else { + copyp = copyarg; + endp = copyarg + sizeof(copyarg) - 1; + while (*arg != '\0' && strchr(SEP, *arg) == NULL && + copyp <= endp) + *copyp++ = *arg++; + if (copyp > endp) { + *endp = '\0'; + tempid = -1; + while (*arg != '\0' && + strchr(SEP, *arg) == NULL) + arg++; + } else { + *copyp = '\0'; + errno = 0; + tempid = strtol(copyarg, &endp, 10); + } + /* + * Write warning messages for any values which + * would never be a valid process number. + */ + if (*endp != '\0' || tempid < 0 || copyarg == endp) { + warnx("invalid process number: %s", copyarg); + errno = ERANGE; + } else if (errno != 0 || tempid > BSD_PID_MAX) { + warnx("process number too large: %s", copyarg); + errno = ERANGE; + } + if (errno == ERANGE) { + /* Ignore this value from the given list. */ + continue; + } + } + if (*npids >= alloc) { + alloc = (alloc + 1) << 1; + morepids = realloc(pids, alloc * sizeof (*pids)); + if (morepids == NULL) { + free(pids); + errx(1, "realloc failed"); + } + pids = morepids; + } + pids[(*npids)++] = tempid; + } + + if (!*npids) + errx(1, "No valid process numbers specified"); + + return (pids); +} + uid_t * getuids(const char *arg, int *nuids) { char name[MAXLOGNAME]; struct passwd *pwd; uid_t *uids, *moreuids; int alloc; size_t l; alloc = 0; *nuids = 0; uids = NULL; for (; (l = strcspn(arg, SEP)) > 0; arg += l + strspn(arg + l, SEP)) { if (l >= sizeof name) { warnx("%.*s: name too long", (int)l, arg); continue; } strncpy(name, arg, l); name[l] = '\0'; if ((pwd = getpwnam(name)) == NULL) { warnx("%s: no such user", name); continue; } if (*nuids >= alloc) { alloc = (alloc + 1) << 1; moreuids = realloc(uids, alloc * sizeof (*uids)); if (moreuids == NULL) { free(uids); errx(1, "realloc failed"); } uids = moreuids; } uids[(*nuids)++] = pwd->pw_uid; } endpwent(); if (!*nuids) errx(1, "No users specified"); return uids; } VARENT * find_varentry(VAR *v) { struct varent *vent; for (vent = vhead; vent; vent = vent->next) { if (strcmp(vent->var->name, v->name) == 0) return vent; } return NULL; } static void scanvars(void) { struct varent *vent; VAR *v; for (vent = vhead; vent; vent = vent->next) { v = vent->var; if (v->flag & DSIZ) { v->dwidth = v->width; v->width = 0; } if (v->flag & USER) needuser = 1; if (v->flag & COMM) needcomm = 1; } } static void dynsizevars(KINFO *ki) { struct varent *vent; VAR *v; int i; for (vent = vhead; vent; vent = vent->next) { v = vent->var; if (!(v->flag & DSIZ)) continue; i = (v->sproc)( ki); if (v->width < i) v->width = i; if (v->width > v->dwidth) v->width = v->dwidth; } } static void sizevars(void) { struct varent *vent; VAR *v; int i; for (vent = vhead; vent; vent = vent->next) { v = vent->var; i = strlen(vent->header); if (v->width < i) v->width = i; totwidth += v->width + 1; /* +1 for space */ } totwidth--; } static const char * fmt(char **(*fn)(kvm_t *, const struct kinfo_proc *, int), KINFO *ki, char *comm, int maxlen) { const char *s; s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, maxlen); return (s); } #define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM)) static void saveuser(KINFO *ki) { if (ki->ki_p->ki_sflag & PS_INMEM) { /* * The u-area might be swapped out, and we can't get * at it because we have a crashdump and no swap. * If it's here fill in these fields, otherwise, just * leave them 0. */ ki->ki_valid = 1; } else ki->ki_valid = 0; /* * save arguments if needed */ if (needcomm && (UREADOK(ki) || (ki->ki_p->ki_args != NULL))) { ki->ki_args = strdup(fmt(kvm_getargv, ki, ki->ki_p->ki_comm, MAXCOMLEN)); } else if (needcomm) { asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); } else { ki->ki_args = NULL; } if (needenv && UREADOK(ki)) { ki->ki_env = strdup(fmt(kvm_getenvv, ki, (char *)NULL, 0)); } else if (needenv) { ki->ki_env = malloc(3); strcpy(ki->ki_env, "()"); } else { ki->ki_env = NULL; } } static int pscomp(const void *a, const void *b) { int i; #define VSIZE(k) ((k)->ki_p->ki_dsize + (k)->ki_p->ki_ssize + \ (k)->ki_p->ki_tsize) if (sortby == SORTCPU) return (getpcpu((const KINFO *)b) - getpcpu((const KINFO *)a)); if (sortby == SORTMEM) return (VSIZE((const KINFO *)b) - VSIZE((const KINFO *)a)); i = (int)((const KINFO *)a)->ki_p->ki_tdev - (int)((const KINFO *)b)->ki_p->ki_tdev; if (i == 0) i = ((const KINFO *)a)->ki_p->ki_pid - ((const KINFO *)b)->ki_p->ki_pid; return (i); } /* * ICK (all for getopt), would rather hide the ugliness * here than taint the main code. * * ps foo -> ps -foo * ps 34 -> ps -p34 * * The old convention that 't' with no trailing tty arg means the users * tty, is only supported if argv[1] doesn't begin with a '-'. This same * feature is available with the option 'T', which takes no argument. */ static char * kludge_oldps_options(char *s) { int have_fmt; size_t len; char *newopts, *ns, *cp; /* * If we have an 'o' option, then note it, since we don't want to do * some types of munging. */ have_fmt = index(s, 'o') != NULL; len = strlen(s); if ((newopts = ns = malloc(len + 2)) == NULL) errx(1, "malloc failed"); /* * options begin with '-' */ if (*s != '-') *ns++ = '-'; /* add option flag */ /* * gaze to end of argv[1] */ cp = s + len - 1; /* * if last letter is a 't' flag with no argument (in the context * of the oldps options -- option string NOT starting with a '-' -- * then convert to 'T' (meaning *this* terminal, i.e. ttyname(0)). * * However, if a flag accepting a string argument is found in the * option string, the remainder of the string is the argument to * that flag; do not modify that argument. */ if (strcspn(s, "MNOoU") == len && *cp == 't' && *s != '-') *cp = 'T'; else { /* * otherwise check for trailing number, which *may* be a * pid. */ while (cp >= s && isdigit(*cp)) --cp; } cp++; memmove(ns, s, (size_t)(cp - s)); /* copy up to trailing number */ ns += cp - s; /* * if there's a trailing number, and not a preceding 'p' (pid) or * 't' (tty) flag, then assume it's a pid and insert a 'p' flag. */ if (isdigit(*cp) && (cp == s || (cp[-1] != 't' && cp[-1] != 'p')) && (cp - 1 == s || cp[-2] != 't') && !have_fmt) *ns++ = 'p'; (void)strcpy(ns, cp); /* and append the number */ return (newopts); } static void usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aCHhjlmrSTuvwxZ] [-O|o fmt] [-p pid] [-t tty] [-U user]", - " [-M core] [-N system]", + "usage: ps [-aCHhjlmrSTuvwxZ] [-O|o fmt] [-p pid[,pid]] [-t tty]", + " [-U user[,user]] [-M core] [-N system]", " ps [-L]"); exit(1); }