From bbd62c1929b3062eea469db8ee56d5477a67db89 Mon Sep 17 00:00:00 2001 From: Sworddragon Date: Thu, 15 May 2014 09:22:03 +0200 Subject: [PATCH 1/2] Added columns and added/fixed aliases in the manpage --- htop.1.in | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/htop.1.in b/htop.1.in index 5c8302ae..74cc1f0f 100644 --- a/htop.1.in +++ b/htop.1.in @@ -1,4 +1,4 @@ -.TH "HTOP" "1" "2011" "@PACKAGE_STRING@" "Utils" +.TH "HTOP" "1" "2014" "@PACKAGE_STRING@" "Utils" .SH "NAME" htop \- interactive process viewer .SH "SYNOPSIS" @@ -179,6 +179,9 @@ The parent process ID. .B PGRP The process's group ID. .TP +.B TGID +The thread group ID. +.TP .B SESSION (SESN) The process's session ID. .TP @@ -224,11 +227,11 @@ executing system calls on behalf of the process, measured in clock ticks. The time, measured in clock ticks that the process has spent in user and system time (see UTIME, STIME above). .TP -.B CUTIME +.B CUTIME (CUTIME+) The children's user CPU time, which is the amount of time the process's waited-for children have spent executing in user mode (see UTIME above). .TP -.B CSTIME +.B CSTIME (CSTIME+) The children's system CPU time, which is the amount of time the kernel has spent executing system calls on behalf of all the process's waited-for children (see STIME above). @@ -237,7 +240,7 @@ STIME above). The kernel's internal priority for the process, usually just its nice value plus twenty. Different for real-time processes. .TP -.B PERCENT_MEM +.B PERCENT_MEM (MEM%) The percentage of memory the process is currently using (based on the process's resident memory size, see M_RESIDENT below). .TP @@ -271,7 +274,7 @@ The user ID of the process owner. The username of the process owner, or the user ID if the name can't be determined. .TP -.B STARTTIME +.B STARTTIME (START) The time the process was started. .TP .B RCHAR (RD_CHAR) @@ -298,12 +301,18 @@ The I/O rate of read(2) in bytes per second, for the process. .B IO_WRITE_RATE (IOWR) The I/O rate of write(2) in bytes per second, for the process. .TP -.B IO_RATE (IO) +.B IO_RATE (IORW) The I/O rate, IO_READ_RATE + IO_WRITE_RATE (see above). .TP .B CNCLWB (IO_CANCEL) Bytes of cancelled write(2) I/O. .TP +.B IO_PRIORITY (IO) +The I/O scheduling class followed by the priority if the class supports it: + \fBR\fR for Realtime + \fBB\fR for Best-effort + \fBid\fR for Idle +.TP .B CGROUP Which cgroup the process is in. .TP From afe0c8cb45eb1cea3f4b87ea0ab01ffe56f87556 Mon Sep 17 00:00:00 2001 From: Sworddragon Date: Thu, 15 May 2014 10:08:46 +0200 Subject: [PATCH 2/2] Reordered columns in the manpage --- htop.1.in | 110 +++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/htop.1.in b/htop.1.in index 74cc1f0f..585ac135 100644 --- a/htop.1.in +++ b/htop.1.in @@ -173,15 +173,21 @@ The full command line of the process (i.e program name and arguments). .B PID The process ID. .TP +.B STATE (S) +The state of the process: + \fBS\fR for sleeping (idle) + \fBR\fR for running + \fBD\fR for disk sleep (uninterruptible) + \fBZ\fR for zombie (waiting for parent to read its exit status) + \fBT\fR for traced or suspended (e.g by SIGTSTP) + \fBW\fR for paging +.TP .B PPID The parent process ID. .TP .B PGRP The process's group ID. .TP -.B TGID -The thread group ID. -.TP .B SESSION (SESN) The process's session ID. .TP @@ -191,29 +197,6 @@ The controlling terminal of the process. .B TPGID The process ID of the foreground process group of the controlling terminal. .TP -.B STATE (S) -The state of the process: - \fBS\fR for sleeping (idle) - \fBR\fR for running - \fBD\fR for disk sleep (uninterruptible) - \fBZ\fR for zombie (waiting for parent to read its exit status) - \fBT\fR for traced or suspended (e.g by SIGTSTP) - \fBW\fR for paging -.TP -.B PROCESSOR (CPU) -The ID of the CPU the process last executed on. -.TP -.B NLWP -The number of threads in the process. -.TP -.B NICE (NI) -The nice value of a process, from 19 (low priority) to -20 (high priority). A -high value means the process is being nice, letting others have a higher -relative priority. Only root can lower the value. -.TP -.B PERCENT_CPU (CPU%) -The percentage of the CPU time that the process is currently using. -.TP .B UTIME (UTIME+) The user CPU time, which is the amount of time the process has spent executing on the CPU in user mode (i.e everything but system calls), measured in clock @@ -223,10 +206,6 @@ ticks. The system CPU time, which is the amount of time the kernel has spent executing system calls on behalf of the process, measured in clock ticks. .TP -.B TIME (TIME+) -The time, measured in clock ticks that the process has spent in user and system -time (see UTIME, STIME above). -.TP .B CUTIME (CUTIME+) The children's user CPU time, which is the amount of time the process's waited-for children have spent executing in user mode (see UTIME above). @@ -240,9 +219,16 @@ STIME above). The kernel's internal priority for the process, usually just its nice value plus twenty. Different for real-time processes. .TP -.B PERCENT_MEM (MEM%) -The percentage of memory the process is currently using (based on the process's -resident memory size, see M_RESIDENT below). +.B NICE (NI) +The nice value of a process, from 19 (low priority) to -20 (high priority). A +high value means the process is being nice, letting others have a higher +relative priority. Only root can lower the value. +.TP +.B STARTTIME (START) +The time the process was started. +.TP +.B PROCESSOR (CPU) +The ID of the CPU the process last executed on. .TP .B M_SIZE (VIRT) Size in memory of the total program size. @@ -258,24 +244,47 @@ The size of the process's shared pages The size of the text segment of the process (i.e the size of the processes executable instructions). .TP -.B M_LRS (LIB) -The library size of the process. -.TP .B M_DRS (DATA) The size of the data segment plus stack usage of the process. .TP +.B M_LRS (LIB) +The library size of the process. +.TP .B M_DT (DIRTY) The size of the dirty pages of the process. .TP .B ST_UID (UID) The user ID of the process owner. .TP +.B PERCENT_CPU (CPU%) +The percentage of the CPU time that the process is currently using. +.TP +.B PERCENT_MEM (MEM%) +The percentage of memory the process is currently using (based on the process's +resident memory size, see M_RESIDENT below). +.TP .B USER The username of the process owner, or the user ID if the name can't be determined. .TP -.B STARTTIME (START) -The time the process was started. +.B TIME (TIME+) +The time, measured in clock ticks that the process has spent in user and system +time (see UTIME, STIME above). +.TP +.B NLWP +The number of threads in the process. +.TP +.B TGID +The thread group ID. +.TP +.B CTID +OpenVZ container ID, a.k.a virtual environment ID. +.TP +.B VPID +OpenVZ process ID. +.TP +.B VXID +VServer process ID. .TP .B RCHAR (RD_CHAR) The number of bytes the process has read. @@ -295,6 +304,9 @@ Bytes of read(2) I/O for the process. .B WBYTES (IO_WBYTES) Bytes of write(2) I/O for the process. .TP +.B CNCLWB (IO_CANCEL) +Bytes of cancelled write(2) I/O. +.TP .B IO_READ_RATE (IORR) The I/O rate of read(2) in bytes per second, for the process. .TP @@ -304,8 +316,11 @@ The I/O rate of write(2) in bytes per second, for the process. .B IO_RATE (IORW) The I/O rate, IO_READ_RATE + IO_WRITE_RATE (see above). .TP -.B CNCLWB (IO_CANCEL) -Bytes of cancelled write(2) I/O. +.B CGROUP +Which cgroup the process is in. +.TP +.B OOM +OOM killer score. .TP .B IO_PRIORITY (IO) The I/O scheduling class followed by the priority if the class supports it: @@ -313,21 +328,6 @@ The I/O scheduling class followed by the priority if the class supports it: \fBB\fR for Best-effort \fBid\fR for Idle .TP -.B CGROUP -Which cgroup the process is in. -.TP -.B CTID -OpenVZ container ID, a.k.a virtual environment ID. -.TP -.B VPID -OpenVZ process ID. -.TP -.B VXID -VServer process ID. -.TP -.B OOM -OOM killer score. -.TP .B All other flags Currently unsupported (always displays '-').