Date: Mon, 17 May 2004 20:55:18 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 52963 for review Message-ID: <200405180355.i4I3tIsN071648@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=52963 Change 52963 by marcel@marcel_nfs on 2004/05/17 20:54:47 IFC @52961 Affected files ... .. //depot/projects/gdb/MAINTAINERS#9 integrate .. //depot/projects/gdb/Makefile.inc1#10 integrate .. //depot/projects/gdb/bin/date/date.1#3 integrate .. //depot/projects/gdb/bin/dd/dd.1#4 integrate .. //depot/projects/gdb/bin/df/df.1#5 integrate .. //depot/projects/gdb/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/gdb/bin/ls/ls.1#5 integrate .. //depot/projects/gdb/bin/ps/ps.1#9 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.c#4 integrate .. //depot/projects/gdb/games/morse/morse.6#4 integrate .. //depot/projects/gdb/games/morse/morse.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_open_file.c#6 integrate .. //depot/projects/gdb/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/getpwent.c#4 integrate .. //depot/projects/gdb/lib/libc/gen/lockf.3#2 integrate .. //depot/projects/gdb/lib/libc/locale/big5.c#7 integrate .. //depot/projects/gdb/lib/libc/locale/gbk.c#7 integrate .. //depot/projects/gdb/lib/libc/locale/utf8.c#6 integrate .. //depot/projects/gdb/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/flock.2#2 integrate .. //depot/projects/gdb/lib/libdisk/disk.c#4 integrate .. //depot/projects/gdb/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/gdb/lib/msun/bsdsrc/mathimpl.h#2 integrate .. //depot/projects/gdb/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/gdb/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/gdb/libexec/makekey/makekey.8#2 integrate .. //depot/projects/gdb/libexec/rshd/rshd.8#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/atmconfig.8#2 integrate .. //depot/projects/gdb/sbin/bsdlabel/bsdlabel.8#4 integrate .. //depot/projects/gdb/sbin/conscontrol/conscontrol.8#3 integrate .. //depot/projects/gdb/sbin/dump/dump.8#6 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/fsck_msdosfs.8#2 integrate .. //depot/projects/gdb/sbin/gbde/gbde.8#2 integrate .. //depot/projects/gdb/sbin/gconcat/gconcat.8#2 integrate .. //depot/projects/gdb/sbin/idmapd/idmapd.8#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/gdb/sbin/init/init.8#4 integrate .. //depot/projects/gdb/sbin/md5/md5.1#2 integrate .. //depot/projects/gdb/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/gdb/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/gdb/sbin/mdmfs/mdmfs.c#4 integrate .. //depot/projects/gdb/sbin/mknod/mknod.8#3 integrate .. //depot/projects/gdb/sbin/mount/mount.8#6 integrate .. //depot/projects/gdb/sbin/mount_cd9660/mount_cd9660.8#3 integrate .. //depot/projects/gdb/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/gdb/sbin/mount_nfs4/mount_nfs4.8#3 integrate .. //depot/projects/gdb/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/gdb/sbin/newfs/newfs.8#4 integrate .. //depot/projects/gdb/sbin/ping6/ping6.8#2 integrate .. //depot/projects/gdb/sbin/restore/restore.8#4 integrate .. //depot/projects/gdb/sbin/route/route.8#3 integrate .. //depot/projects/gdb/sbin/routed/routed.8#4 integrate .. //depot/projects/gdb/sbin/sunlabel/sunlabel.8#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#8 integrate .. //depot/projects/gdb/share/man/man4/ng_ether.4#3 integrate .. //depot/projects/gdb/share/man/man4/ng_one2many.4#4 integrate .. //depot/projects/gdb/share/man/man4/smb.4#2 integrate .. //depot/projects/gdb/share/man/man9/Makefile#7 integrate .. //depot/projects/gdb/share/man/man9/rman.9#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/gdb/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/gdb/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/gdb/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/gdb/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/gdb/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/gdb/sys/amd64/include/smp.h#3 integrate .. //depot/projects/gdb/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/gdb/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/gdb/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/gdb/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/gdb/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/gdb/sys/amd64/isa/nmi.c#3 integrate .. //depot/projects/gdb/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/gdb/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/boot/common/loader.8#4 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/gdb/sys/conf/files.alpha#5 integrate .. //depot/projects/gdb/sys/conf/files.amd64#8 integrate .. //depot/projects/gdb/sys/conf/files.i386#16 integrate .. //depot/projects/gdb/sys/conf/files.ia64#6 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#3 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc.c#1 branch .. //depot/projects/gdb/sys/dev/fdc/fdcreg.h#1 branch .. //depot/projects/gdb/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/gdb/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/gdb/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/gdb/sys/dev/smbus/smb.c#3 integrate .. //depot/projects/gdb/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/gdb/sys/dev/twa/twa.h#3 integrate .. //depot/projects/gdb/sys/dev/twa/twa_cam.c#3 integrate .. //depot/projects/gdb/sys/dev/twa/twa_freebsd.c#4 integrate .. //depot/projects/gdb/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/gdb/sys/i386/conf/NOTES#12 integrate .. //depot/projects/gdb/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/gdb/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/isa/fd.c#7 delete .. //depot/projects/gdb/sys/isa/fdreg.h#3 delete .. //depot/projects/gdb/sys/kern/kern_linker.c#4 integrate .. //depot/projects/gdb/sys/kern/link_elf.c#2 integrate .. //depot/projects/gdb/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/gdb/sys/modules/Makefile#12 integrate .. //depot/projects/gdb/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/gdb/sys/sys/linker.h#2 integrate .. //depot/projects/gdb/usr.bin/finger/net.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#5 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#8 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#6 integrate .. //depot/projects/gdb/usr.bin/tar/matching.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#6 integrate .. //depot/projects/gdb/usr.bin/tar/util.c#4 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#10 integrate .. //depot/projects/gdb/usr.sbin/Makefile#6 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi_user.c#4 integrate .. //depot/projects/gdb/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/gdb/usr.sbin/cron/cron/cron.8#2 integrate .. //depot/projects/gdb/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/gdb/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/gdb/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/gdb/usr.sbin/gstat/gstat.c#5 integrate .. //depot/projects/gdb/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/gdb/usr.sbin/mrouted/cfparse.y#2 integrate .. //depot/projects/gdb/usr.sbin/pccard/pccardc/pccardc.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.lockd/lockd_lock.c#3 integrate .. //depot/projects/gdb/usr.sbin/smbmsg/Makefile#1 branch .. //depot/projects/gdb/usr.sbin/smbmsg/pathnames.h#1 branch .. //depot/projects/gdb/usr.sbin/smbmsg/smbmsg.8#1 branch .. //depot/projects/gdb/usr.sbin/smbmsg/smbmsg.c#1 branch Differences ... ==== //depot/projects/gdb/MAINTAINERS#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.89 2004/05/10 10:07:25 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.90 2004/05/16 22:05:25 njl Exp $ subsystem login notes ----------------------------- @@ -39,7 +39,6 @@ libcam ken Pre-commit review requested. libdevstat ken Pre-commit review requested. iostat(8) ken Pre-commit review requested. -da(4) njl Pre-commit review requested. send to scsi@freebsd.org cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. ==== //depot/projects/gdb/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.426 2004/05/13 07:51:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.427 2004/05/17 16:19:51 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -111,7 +111,7 @@ .else _TARGET_CPUTYPE=dummy .endif -_CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ +_CPUTYPE!= MAKEFLAGS= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. ==== //depot/projects/gdb/bin/date/date.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.63 2004/04/06 22:03:38 green Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.64 2004/05/16 21:33:48 ru Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -38,7 +38,7 @@ .Nm date .Nd display or set date and time .Sh SYNOPSIS -.Nm +.Nm .Op Fl ju .Op Fl r Ar seconds .Oo @@ -58,8 +58,7 @@ .Sm on .Nm .Op Fl jnu -.Fl f -.Ar input_fmt new_date +.Fl f Ar input_fmt new_date .Op Cm + Ns Ar output_fmt .Nm .Op Fl d Ar dst @@ -97,9 +96,9 @@ .Fa tz_dsttime . .It Fl f Use -.Ar fmt +.Ar input_fmt as the format string to parse the -.Ar date +.Ar new_date provided rather than using the default .Sm off .Oo Oo Oo Oo Oo @@ -316,7 +315,9 @@ .Pp may be used on one machine to print out the date suitable for setting on another. -("+%m%d%H%M%Y.%S" for use on Linux) +.Qq ( Li "+%m%d%H%M%Y.%S" +for use on +.Tn Linux . ) .Pp The command: .Pp ==== //depot/projects/gdb/bin/dd/dd.1#4 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.23 2004/04/06 20:06:46 markm Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.24 2004/05/16 21:34:14 ru Exp $ .\" -.Dd January 13, 1994 +.Dd March 5, 2004 .Dt DD 1 .Os .Sh NAME @@ -360,17 +360,21 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: -.Dl dd if=/dev/ad0 of=/dev/null bs=1m +.Pp +.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: -.Dl dd if=/dev/ad0 of=/dev/ad0 bs=1m +.Pp +.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Pp +Remove parity bit from a file: .Pp -Remove parity bit from a file -.Dl dd if=file conv=parnone of=file.txt +.Dl "dd if=file conv=parnone of=file.txt" .Pp Check for (even) parity errors on a file: -.Dl dd if=file conv=pareven | cmp -x - file +.Pp +.Dl "dd if=file conv=pareven | cmp -x - file" .Sh DIAGNOSTICS .Ex -std .Sh SEE ALSO ==== //depot/projects/gdb/bin/df/df.1#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.33 2004/04/22 16:33:54 obrien Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.34 2004/05/16 21:34:15 ru Exp $ .\" -.Dd May 8, 1995 +.Dd April 22, 2004 .Dt DF 1 .Os .Sh NAME @@ -36,10 +36,7 @@ .Nd display free disk space .Sh SYNOPSIS .Nm -.Oo -.Fl b | g | h | H | k | -.Fl m | P -.Oc +.Op Fl b | g | H | h | k | m | P .Op Fl aciln .Op Fl t Ar type .Op Ar file | filesystem ... ==== //depot/projects/gdb/bin/getfacl/getfacl.1#2 (text+ko) ==== @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.7 2003/02/23 01:43:45 ru Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.8 2004/05/16 21:34:31 ru Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd Decemer 30, 2002 +.Dd December 30, 2002 .Dt GETFACL 1 .Os .Sh NAME ==== //depot/projects/gdb/bin/ls/ls.1#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.80 2004/05/02 11:25:37 tjr Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.81 2004/05/16 21:34:49 ru Exp $ .\" .Dd May 2, 2004 .Dt LS 1 @@ -185,7 +185,7 @@ Note that .Fl k is mutually exclusive to -.Fl h +.Fl h , and later .Fl k will nullify earlier ==== //depot/projects/gdb/bin/ps/ps.1#9 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.75 2004/04/06 20:06:49 markm Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.76 2004/05/16 21:35:05 ru Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -37,26 +37,14 @@ .Sh SYNOPSIS .Nm .Op Fl aCcefHhjlmrSTuvwXxZ -.Oo Fl G Ar gid Ns Xo -.Op , Ns Ar gid Ns No ... -.Xc -.Oc +.Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ... .Op Fl M Ar core .Op Fl N Ar system .Op Fl O Ar fmt .Op Fl o Ar fmt -.Oo Fl p Ar pid Ns Xo -.Op , Ns Ar pid Ns No ... -.Xc -.Oc -.Oo Fl t Ar tty Ns Xo -.Op , Ns Ar tty Ns No ... -.Xc -.Oc -.Oo Fl U Ar username Ns Xo -.Op , Ns Ar username Ns No ... -.Xc -.Oc +.Op Fl p Ar pid Ns Op , Ns Ar pid Ns Ar ... +.Op Fl t Ar tty Ns Op , Ns Ar tty Ns Ar ... +.Op Fl U Ar username Ns Op , Ns Ar username Ns Ar ... .Nm .Op Fl L .Sh DESCRIPTION @@ -69,7 +57,7 @@ .Pp A different set of processes can be selected for display by using any combination of the -.Fl a , G , p , T , t +.Fl a , G , p , T , t , and .Fl U options. @@ -86,8 +74,7 @@ option may result in multiple output lines (one line per thread) for some processes. By default all of these output lines are sorted first by controlling -terminal, then by process -.Tn ID . +terminal, then by process ID. The .Fl m , r , u , and @@ -98,14 +85,12 @@ .Pp For the processes which have been selected for display, the information to display is selected based on a set of keywords (see the -.Fl L -.Fl O +.Fl L , 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), +The default output format includes, for each process, the process' ID, +controlling terminal, CPU time (including both user and system time), state, and associated command. .Pp The process file system (see @@ -126,25 +111,30 @@ .Va security.bsd.see_other_uids sysctl to zero. .It Fl c -Change the ``command'' column output to just contain the executable name, +Change the +.Dq 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 +Change the way the CPU percentage is calculated by using a +.Dq raw +CPU calculation that ignores +.Dq 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. +This option is honored only if the UID of the user is 0. .It Fl G Display information about processes which are running with the specified -real group -.Tn ID(s) . +real group IDs. .It Fl H Show all of the .Em kernel visible -threads associated with each process. Depending on the threading package that +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 @@ -152,7 +142,9 @@ 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. +.Cm user , pid , ppid , pgid , jobc , state , tt , time , +and +.Cm command . .It Fl L List the set of keywords available for the .Fl O @@ -161,25 +153,27 @@ options. .It Fl l Display information associated with the following keywords: -uid, pid, ppid, cpu, pri, nice, vsz, rss, mwchan, state, tt, time -and command. +.Cm uid , pid , ppid , cpu , pri , nice , vsz , rss , mwchan , state , +.Cm tt , time , +and +.Cm command . .It Fl M Extract values associated with the name list from the specified core instead of the currently running system. .It Fl m Sort by memory usage, instead of the combination of controlling -terminal and process -.Tn ID . +terminal and process ID. .It Fl N Extract the name list from the specified system instead of the default, which is the kernel image the system has booted from. .It Fl O Add the information associated with the space or comma separated list -of keywords specified, after the process -.Tn ID , +of keywords specified, after the process ID, in the default information display. -Keywords may be appended with an equals (``='') sign and a string. +Keywords may be appended with an equals +.Pq Ql = +sign and a string. This causes the printed header to use the specified string instead of the standard header. .It Fl o @@ -188,16 +182,16 @@ 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. +Keywords may be appended with an equals +.Pq Ql = +sign and a string. This causes the printed header to use the specified string instead of the standard header. .It Fl p -Display information about processes which match the specified process -.Tn ID(s) . +Display information about processes which match the specified process IDs. .It Fl r -Sort by current cpu usage, instead of the combination of controlling -terminal and process -.Tn ID . +Sort by current CPU usage, instead of the combination of controlling +terminal and process ID. .It Fl S Change the way the process time is calculated by summing all exited children to their parent process. @@ -206,13 +200,14 @@ with the standard input. .It Fl t Display information about processes attached to the specified terminal -device(s). +devices. .It Fl U -Display the processes belonging to the specified -.Ar username Ns (s) . +Display the processes belonging to the specified usernames. .It Fl u Display information associated with the following keywords: -user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command. +.Cm user , pid , %cpu , %mem , vsz , rss , tt , state , start , time , +and +.Cm command . The .Fl u option implies the @@ -220,8 +215,10 @@ 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. +.Cm pid , state , time , sl , re , pagein , vsz , rss , lim , tsiz , +.Cm %cpu , %mem , +and +.Cm command . The .Fl v option implies the @@ -260,16 +257,16 @@ 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 +.It Cm %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 +.Cm %cpu fields to exceed 100%. -.It %mem +.It Cm %mem The percentage of real memory used by this process. -.It flags +.It Cm flags The flags associated with the process as in the include file .In sys/proc.h : @@ -298,104 +295,112 @@ .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 +.It Cm label The MAC label of the process. -.It lim +.It Cm 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 +.It Cm lstart +The exact time the command started, using the +.Ql %c +format described in .Xr strftime 3 . -.It lockname +.It Cm 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 +.It Cm 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 +.It Cm nice The process scheduling increment (see .Xr setpriority 2 ) . -.It rss +.It Cm rss the real memory (resident set) size of the process (in 1024 byte units). -.It start +.It Cm 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 +displayed using the +.Dq Li %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 +displayed using the +.Dq Li %a6.15p +format. +Otherwise, the start time is displayed using the +.Dq Li %e%b%y +format. +.It Cm state The state is given by a sequence of characters, for example, -.Dq Tn RWNA . +.Dq Li RWNA . The first character indicates the run state of the process: .Pp .Bl -tag -width indent -compact -.It D +.It Li D Marks a process in disk (or other short term, uninterruptible) wait. -.It I +.It Li I Marks a process that is idle (sleeping for longer than about 20 seconds). -.It L +.It Li L Marks a process that is waiting to acquire a lock. -.It R +.It Li R Marks a runnable process. -.It S +.It Li S Marks a process that is sleeping for less than about 20 seconds. -.It T +.It Li T Marks a stopped process. -.It W +.It Li W Marks an idle interrupt thread. -.It Z -Marks a dead process (a ``zombie''). +.It Li Z +Marks a dead process (a +.Dq zombie ) . .El .Pp Additional characters after these, if any, indicate additional state information: .Pp .Bl -tag -width indent -compact -.It + +.It Li + The process is in the foreground process group of its control terminal. -.It < -The process has raised -.Tn CPU -scheduling priority. -.It E +.It Li < +The process has raised CPU scheduling priority. +.It Li E The process is trying to exit. -.It J +.It Li J Marks a process which is in .Xr jail 2 . The hostname of the prison can be found in -.Ql /proc/<pid>/status . -.It L +.Pa /proc/ Ns Ao Ar pid Ac Ns Pa /status . +.It Li 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 +.It Li N +The process has reduced CPU scheduling priority (see .Xr setpriority 2 ) . -.It s +.It Li s The process is a session leader. -.It V +.It Li V The process is suspended during a .Xr vfork 2 . -.It W +.It Li W The process is swapped out. -.It X +.It Li X The process is being traced or debugged. .El -.It tt +.It Cm 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 +or, for the console, +.Dq Li con . +This is followed by a +.Ql - +if the process can no longer reach that controlling terminal (i.e., it has been revoked). -.It wchan +.It Cm 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 @@ -404,8 +409,11 @@ .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 ``<defunct>'', and a process which is blocked while trying -to exit is listed as ``<exiting>''. +is listed as +.Dq Li <defunct> , +and a process which is blocked while trying +to exit is listed as +.Dq Li <exiting> . The .Nm utility @@ -420,154 +428,162 @@ 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 +.Bl -tag -width ".Cm sigignore" -compact +.It Cm %cpu +percentage CPU usage (alias +.Cm pcpu ) +.It Cm %mem +percentage memory usage (alias +.Cm pmem ) +.It Cm acflag +accounting flag (alias +.Cm acflg ) +.It Cm args command and arguments -.It comm +.It Cm comm command -.It command +.It Cm command command and arguments -.It cpu -short-term cpu usage factor (for scheduling) -.It etime +.It Cm cpu +short-term CPU usage factor (for scheduling) +.It Cm etime elapsed running time -.It flags -the process flags, in hexadecimal (alias f) -.It inblk -total blocks read (alias inblock) -.It jobc +.It Cm flags +the process flags, in hexadecimal (alias +.Cm f ) +.It Cm inblk +total blocks read (alias +.Cm inblock ) +.It Cm jobc job control count -.It ktrace +.It Cm ktrace tracing flags -.It label +.It Cm label MAC label -.It lim +.It Cm lim memoryuse limit -.It logname +.It Cm logname login name of user who started the process -.It lstart +.It Cm lstart time started -.It majflt +.It Cm majflt total page faults -.It minflt +.It Cm minflt total page reclaims -.It msgrcv +.It Cm msgrcv total messages received (reads from pipes/sockets) -.It msgsnd +.It Cm msgsnd total messages sent (writes on pipes/sockets) -.It lockname +.It Cm lockname lock currently blocked on (as a symbolic name) -.It mwchan +.It Cm mwchan wait channel or lock currently blocked on -.It nice -nice value (alias ni) -.It nivcsw +.It Cm nice +nice value (alias +.Cm ni ) +.It Cm nivcsw total involuntary context switches -.It nsigs -total signals taken (alias nsignals) -.It nswap +.It Cm nsigs +total signals taken (alias +.Cm nsignals ) +.It Cm nswap total swaps in/out -.It nvcsw +.It Cm nvcsw total voluntary context switches -.It nwchan +.It Cm nwchan wait channel (as an address) -.It oublk -total blocks written (alias oublock) -.It paddr +.It Cm oublk +total blocks written (alias +.Cm oublock ) +.It Cm paddr swap address -.It pagein +.It Cm pagein pageins (same as majflt) -.It pgid +.It Cm pgid process group number -.It pid -process -.Tn ID -.It poip +.It Cm pid +process ID +.It Cm poip pageouts in progress -.It ppid -parent process -.Tn ID -.It pri +.It Cm ppid +parent process ID +.It Cm pri scheduling priority -.It re +.It Cm re core residency time (in seconds; 127 = infinity) -.It rgid -real group -.Tn ID -.It rgroup +.It Cm rgid +real group ID +.It Cm rgroup group name (from rgid) -.It rlink +.It Cm rlink reverse link on run queue, or 0 -.It rss +.It Cm rss resident set size -.It rtprio +.It Cm rtprio realtime priority (101 = not a realtime process) -.It ruid -real user -.Tn ID -.It ruser +.It Cm ruid +real user ID +.It Cm 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 +.It Cm sid +session ID +.It Cm sig +pending signals (alias +.Cm pending ) +.It Cm sigcatch +caught signals (alias +.Cm caught ) +.It Cm sigignore +ignored signals (alias +.Cm ignored ) +.It Cm sigmask +blocked signals (alias +.Cm blocked ) +.It Cm sl sleep time (in seconds; 127 = infinity) -.It start +.It Cm start time started -.It state -symbolic process state (alias stat) -.It svgid +.It Cm state +symbolic process state (alias +.Cm stat ) +.It Cm svgid saved gid from a setgid executable -.It svuid -saved uid from a setuid executable -.It tdev +.It Cm svuid +saved UID from a setuid executable +.It Cm tdev control terminal device number -.It time -accumulated cpu time, user + system (alias cputime) -.It tpgid -control terminal process group -.Tn ID -.\".It trss +.It Cm time +accumulated CPU time, user + system (alias +.Cm cputime ) +.It Cm tpgid +control terminal process group ID +.\".It Cm trss .\"text resident set size (in Kbytes) -.It tsid -control terminal session -.Tn ID -.It tsiz +.It Cm tsid >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405180355.i4I3tIsN071648>