emo
/
procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity
procps/src/ps/output.c

2334 lines
99 KiB
C
Raw Normal View History

procps 010114
2002-02-02 04:17:29 +05:30
/*
docs: clarification to license headers in files Add license header to all files. The summary of licensing is below, taken from Craig Small's email which is referred in commit message tail. sysctl and pgrep are GPL 2+ The rest is LGPL 2.1+ Reference: http://www.freelists.org/post/procps/Incorrect-FSF-address-in-the-license-files,8 Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=797962 CC: Craig Small <csmall@enc.com.au> CC: Jaromir Capik <jcapik@redhat.com> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-02 17:59:36 +05:30
* output.c - ps output definitions
* Copyright 1999-2004 by Albert Cahalan
procps 010114
2002-02-02 04:17:29 +05:30
*
docs: clarification to license headers in files Add license header to all files. The summary of licensing is below, taken from Craig Small's email which is referred in commit message tail. sysctl and pgrep are GPL 2+ The rest is LGPL 2.1+ Reference: http://www.freelists.org/post/procps/Incorrect-FSF-address-in-the-license-files,8 Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=797962 CC: Craig Small <csmall@enc.com.au> CC: Jaromir Capik <jcapik@redhat.com> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-02 17:59:36 +05:30
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
procps 010114
2002-02-02 04:17:29 +05:30
* but WITHOUT ANY WARRANTY; without even the implied warranty of
docs: clarification to license headers in files Add license header to all files. The summary of licensing is below, taken from Craig Small's email which is referred in commit message tail. sysctl and pgrep are GPL 2+ The rest is LGPL 2.1+ Reference: http://www.freelists.org/post/procps/Incorrect-FSF-address-in-the-license-files,8 Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=797962 CC: Craig Small <csmall@enc.com.au> CC: Jaromir Capik <jcapik@redhat.com> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-02 17:59:36 +05:30
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
procps 010114
2002-02-02 04:17:29 +05:30
*/
/*
* This file is really gross, and I know it. I looked into several
* alternate ways to deal with the mess, and they were all ugly.
*
* FreeBSD has a fancy hack using offsets into a struct -- that
* saves code but it is _really_ gross. See the PO macro below.
*
* We could have a second column width for wide output format.
* For example, Digital prints the real-time signals.
*/
/*
* Data table idea:
*
* table 1 maps aix to specifier
* table 2 maps shortsort to specifier
* table 3 maps macro to specifiers
* table 4 maps specifier to title,datatype,offset,vendor,helptext
* table 5 maps datatype to justification,width,widewidth,sorting,printing
*
* Here, "datatype" could be user,uid,u16,pages,deltaT,signals,tty,longtty...
* It must be enough to determine printing and sorting.
*
* After the tables, increase width as needed to fit the header.
*
* Table 5 could go in a file with the output functions.
*/
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
#include <ctype.h>
ps/output.c: include <dlfcn.h> only when necessary dlopen() functionality is only used when SELinux support is enabled, so <dlfcn.h> only needs to be included when ENABLE_LIBSELINUX is defined. This fixes the build in configurations where <dlfcn.h> is not available. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-08-07 14:38:26 +05:30
#if ENABLE_LIBSELINUX
ps: minor reformatting and trailing whitespace elimination This patch mostly reorganizes include files and eliminates some useless trailing whitespace. It also adopts the standard procps-ng unconditional approach to nls initialization.
2011-12-28 03:52:43 +05:30
#include <dlfcn.h>
ps/output.c: include <dlfcn.h> only when necessary dlopen() functionality is only used when SELinux support is enabled, so <dlfcn.h> only needs to be included when ENABLE_LIBSELINUX is defined. This fixes the build in configurations where <dlfcn.h> is not available. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-08-07 14:38:26 +05:30
#endif
library: make that 'escape_str' private to our library In that commit referenced below, a promise was made to revisit an 'escape_str' function in efforts to make it private to the library. The problem was it's needed by both ps plus the library which is why it was exported. So, in an effort to remove it from libprocps.sym, this patch duplicates all the required code in ps/output.c. Now, each version can be made private to their caller. [ along the way we'll use this opportunity to remove ] [ the 'restrict' qualifiers from function parameters ] [ while swatting a compiler warning referenced below ] Reference(s): . April 2016, most escape functions made private commit d916d5db86cbbf552401026aab15c3663412d662 proc/escape.c: In function `escape_command': proc/escape.c:182:23: warning: initialization of `const char **' from incompatible pointer type `char **' [-Wincompatible-pointer-types] 182 | const char **lc = (char**)pp->cmdline; | ^ Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-06-30 10:30:00 +05:30
#include <ctype.h>
procps 010114
2002-02-02 04:17:29 +05:30
#include <fcntl.h>
#include <grp.h>
library: make that 'escape_str' private to our library In that commit referenced below, a promise was made to revisit an 'escape_str' function in efforts to make it private to the library. The problem was it's needed by both ps plus the library which is why it was exported. So, in an effort to remove it from libprocps.sym, this patch duplicates all the required code in ps/output.c. Now, each version can be made private to their caller. [ along the way we'll use this opportunity to remove ] [ the 'restrict' qualifiers from function parameters ] [ while swatting a compiler warning referenced below ] Reference(s): . April 2016, most escape functions made private commit d916d5db86cbbf552401026aab15c3663412d662 proc/escape.c: In function `escape_command': proc/escape.c:182:23: warning: initialization of `const char **' from incompatible pointer type `char **' [-Wincompatible-pointer-types] 182 | const char **lc = (char**)pp->cmdline; | ^ Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-06-30 10:30:00 +05:30
#include <langinfo.h>
procps 010114
2002-02-02 04:17:29 +05:30
#include <limits.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
ps: minor reformatting and trailing whitespace elimination This patch mostly reorganizes include files and eliminates some useless trailing whitespace. It also adopts the standard procps-ng unconditional approach to nls initialization.
2011-12-28 03:52:43 +05:30
#include <time.h>
#include <unistd.h>
library: make that 'escape_str' private to our library In that commit referenced below, a promise was made to revisit an 'escape_str' function in efforts to make it private to the library. The problem was it's needed by both ps plus the library which is why it was exported. So, in an effort to remove it from libprocps.sym, this patch duplicates all the required code in ps/output.c. Now, each version can be made private to their caller. [ along the way we'll use this opportunity to remove ] [ the 'restrict' qualifiers from function parameters ] [ while swatting a compiler warning referenced below ] Reference(s): . April 2016, most escape functions made private commit d916d5db86cbbf552401026aab15c3663412d662 proc/escape.c: In function `escape_command': proc/escape.c:182:23: warning: initialization of `const char **' from incompatible pointer type `char **' [-Wincompatible-pointer-types] 182 | const char **lc = (char**)pp->cmdline; | ^ Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-06-30 10:30:00 +05:30
#include <wchar.h>
#include <wctype.h>
ps: minor reformatting and trailing whitespace elimination This patch mostly reorganizes include files and eliminates some useless trailing whitespace. It also adopts the standard procps-ng unconditional approach to nls initialization.
2011-12-28 03:52:43 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
#include <sys/ioctl.h>
ps: minor reformatting and trailing whitespace elimination This patch mostly reorganizes include files and eliminates some useless trailing whitespace. It also adopts the standard procps-ng unconditional approach to nls initialization.
2011-12-28 03:52:43 +05:30
#include <sys/mman.h>
procps 010114
2002-02-02 04:17:29 +05:30
#include <sys/resource.h>
#include <sys/types.h>
library: tweak formatting for readstat header and code This patch mostly just eliminates darn tab characters. Plus the library function declarations and definitions have been standardized. Most visibly, the input params now have all been indented on their own separate line. The following names were changed to more closely match meminfo.c or provide a certain symmetry. Unfortunately that also impacted some other pgms which were updated. . 'procps_stat_get' evolved into 'procps_stat_get_sys' . 'procps_stat_info' is now known as 'procps_statinfo' [and just a little trailing whitespace was eliminated] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-06-28 10:30:00 +05:30
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
#include "../include/c.h"
ps: minor reformatting and trailing whitespace elimination This patch mostly reorganizes include files and eliminates some useless trailing whitespace. It also adopts the standard procps-ng unconditional approach to nls initialization.
2011-12-28 03:52:43 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
#include "common.h"
/* TODO:
* Stop assuming system time is local time.
*/
#define COLWID 240 /* satisfy snprintf, which is faster than sprintf */
0059-ps/output.c: Enforce a safe range for max_rightward. Enforce a maximum max_rightward of OUTBUF_SIZE-1, because it is used in constructs such as "snprintf(outbuf, max_rightward+1," (we could remove the extra check at the beginning of forest_helper() now, but we decided to leave it, as a precaution and reminder). The minimum max_rightward check is not strictly needed, because it is unsigned. However, we decided to add it anyway: - most of the other variables are signed; - make it visually clear that this case is properly handled; - ideally, the minimum max_rightward should be 1, not 0 (to prevent integer overflows such as "max_rightward-1"), but this might change the behavior/output of ps, so we decided against it, for now. Instead, we fixed the only function that overflows if max_rightward is 0. Also, enforce the same safe range for max_leftward, although it is never used throughout the code-base. ---------------------------- adapted for newlib branch . adapted via 'patch' without rejections Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
static unsigned max_rightward = OUTBUF_SIZE-1; /* space for RIGHT stuff */
static unsigned max_leftward = OUTBUF_SIZE-1; /* space for LEFT stuff */
procps 010114
2002-02-02 04:17:29 +05:30
GPLONLY_ and PID-related stuff
2003-07-03 10:50:19 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
static int wide_signals; /* true if we have room */
added ps etimes, miscellaneous top enhancements ps program . etimes added for ELAPSED expressed in seconds . time_t used in place of former unsigned long top program . corrected scroll message bug when 'x' toggle on . fixed forest view potential missing libflags bug . improved 'k' default signal invocation logic . enhanced logic for %CPU maximums displayed . made signal handling more robust and efficient
2011-09-12 17:48:23 +05:30
static time_t seconds_since_1970;
procps 010114
2002-02-02 04:17:29 +05:30
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
extern long Hertz;
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
static unsigned int boot_time(void)
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
{
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
static unsigned int boot_time = 0;
related: adapt to changes in 'context' structure names Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
struct stat_info *stat_info = NULL;
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
if (boot_time == 0) {
if (procps_stat_new(&stat_info) < 0)
xerrx(EXIT_FAILURE, _("Unable to get system boot time"));
boot_time = STAT_GET(stat_info, STAT_SYS_TIME_OF_BOOT, ul_int);
procps_stat_unref(&stat_info);
}
return boot_time;
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
}
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
static unsigned long memory_total()
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
{
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
static unsigned long memory_total = 0;
related: adapt to changes in 'context' structure names Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
struct meminfo_info *mem_info = NULL;
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
if (memory_total == 0) {
if (procps_meminfo_new(&mem_info) < 0)
xerrx(EXIT_FAILURE,
_("Unable to get total memory"));
memory_total = MEMINFO_GET(mem_info, MEMINFO_MEM_TOTAL, ul_int);
procps_meminfo_unref(&mem_info);
}
return memory_total;
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
}
procps 010114
2002-02-02 04:17:29 +05:30
0048-ps/output.c: Make sure all escape*() arguments are safe. The SECURE_ESCAPE_ARGS() macro solves several potential problems (although we found no problematic calls to the escape*() functions in procps's code-base, but had to thoroughly review every call; and this is library code): 1/ off-by-one overflows if the size of the destination buffer is 0; 2/ buffer overflows if this size (or "maxroom") is negative; 3/ integer overflows (for example, "*maxcells+1"); 4/ always null-terminate the destination buffer (unless its size is 0). ---------------------------- adapted for newlib branch . formerly applied to proc/escape.c . function was moved to ps/output.c Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
#define SECURE_ESCAPE_ARGS(dst, bytes, cells) do { \
if ((bytes) <= 0) return 0; \
*(dst) = '\0'; \
if ((bytes) >= INT_MAX) return 0; \
if ((cells) >= INT_MAX) return 0; \
if ((cells) <= 0) return 0; \
} while (0)
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
// copy a string that doesn't need to be 'escaped'
library: re-arrange escape commands escaped_copy(): only appears in ps, moved to ps/output.c escape_strlist() only used in escape.c made static escape_command() used in library, made internal procps.h no longer includes escape.h escape_str() used by library and ps so needs to be exported definition put into procps.h including the odd define required. Far from ideal to have it this way, will look at it another time to have it all in, all out or split nicer so its not in the API; perhaps a lib/ file?
2016-04-17 10:15:19 +05:30
static int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom){
int n;
0048-ps/output.c: Make sure all escape*() arguments are safe. The SECURE_ESCAPE_ARGS() macro solves several potential problems (although we found no problematic calls to the escape*() functions in procps's code-base, but had to thoroughly review every call; and this is library code): 1/ off-by-one overflows if the size of the destination buffer is 0; 2/ buffer overflows if this size (or "maxroom") is negative; 3/ integer overflows (for example, "*maxcells+1"); 4/ always null-terminate the destination buffer (unless its size is 0). ---------------------------- adapted for newlib branch . formerly applied to proc/escape.c . function was moved to ps/output.c Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
SECURE_ESCAPE_ARGS(dst, bufsize, *maxroom);
library: re-arrange escape commands escaped_copy(): only appears in ps, moved to ps/output.c escape_strlist() only used in escape.c made static escape_command() used in library, made internal procps.h no longer includes escape.h escape_str() used by library and ps so needs to be exported definition put into procps.h including the odd define required. Far from ideal to have it this way, will look at it another time to have it all in, all out or split nicer so its not in the API; perhaps a lib/ file?
2016-04-17 10:15:19 +05:30
if (bufsize > *maxroom+1)
bufsize = *maxroom+1;
n = snprintf(dst, bufsize, "%s", src);
0052-ps/output.c: Handle negative snprintf() return value. May happen if strlen(src) > INT_MAX for example. This patch prevents escaped_copy() from increasing maxroom and returning -1 (= number of bytes consumed in dst). ---------------------------- adapted for newlib branch . formerly applied to proc/escape.c . function was moved to ps/output.c Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if (n < 0) {
*dst = '\0';
return 0;
}
library: re-arrange escape commands escaped_copy(): only appears in ps, moved to ps/output.c escape_strlist() only used in escape.c made static escape_command() used in library, made internal procps.h no longer includes escape.h escape_str() used by library and ps so needs to be exported definition put into procps.h including the odd define required. Far from ideal to have it this way, will look at it another time to have it all in, all out or split nicer so its not in the API; perhaps a lib/ file?
2016-04-17 10:15:19 +05:30
if (n >= bufsize)
n = bufsize-1;
*maxroom -= n;
return n;
}
"size" means kB of swappable address space
2002-10-03 12:16:01 +05:30
library: make that 'escape_str' private to our library In that commit referenced below, a promise was made to revisit an 'escape_str' function in efforts to make it private to the library. The problem was it's needed by both ps plus the library which is why it was exported. So, in an effort to remove it from libprocps.sym, this patch duplicates all the required code in ps/output.c. Now, each version can be made private to their caller. [ along the way we'll use this opportunity to remove ] [ the 'restrict' qualifiers from function parameters ] [ while swatting a compiler warning referenced below ] Reference(s): . April 2016, most escape functions made private commit d916d5db86cbbf552401026aab15c3663412d662 proc/escape.c: In function `escape_command': proc/escape.c:182:23: warning: initialization of `const char **' from incompatible pointer type `char **' [-Wincompatible-pointer-types] 182 | const char **lc = (char**)pp->cmdline; | ^ Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-06-30 10:30:00 +05:30
// duplicated from proc/escape.c so both can be made private
static int escape_str_utf8 (char *dst, const char *src, int bufsize, int *maxcells) {
int my_cells = 0;
int my_bytes = 0;
mbstate_t s;
SECURE_ESCAPE_ARGS(dst, bufsize, *maxcells);
memset(&s, 0, sizeof (s));
for(;;) {
wchar_t wc;
int len = 0;
if(my_cells >= *maxcells || my_bytes+1 >= bufsize)
break;
if (!(len = mbrtowc (&wc, src, MB_CUR_MAX, &s)))
/* 'str' contains \0 */
break;
if (len < 0) {
/* invalid multibyte sequence -- zeroize state */
memset (&s, 0, sizeof (s));
*(dst++) = '?';
src++;
my_cells++;
my_bytes++;
} else if (len==1) {
/* non-multibyte */
*(dst++) = isprint(*src) ? *src : '?';
src++;
my_cells++;
my_bytes++;
} else if (!iswprint(wc)) {
/* multibyte - no printable */
*(dst++) = '?';
src+=len;
my_cells++;
my_bytes++;
} else {
/* multibyte - maybe, kinda "printable" */
int wlen = wcwidth(wc);
// Got space?
if (wlen > *maxcells-my_cells || len >= bufsize-(my_bytes+1)) break;
// safe multibyte
memcpy(dst, src, len);
dst += len;
src += len;
my_bytes += len;
if (wlen > 0) my_cells += wlen;
}
//fprintf(stdout, "cells: %d\n", my_cells);
}
*dst = '\0';
// fprintf(stderr, "maxcells: %d, my_cells; %d\n", *maxcells, my_cells);
*maxcells -= my_cells;
return my_bytes; // bytes of text, excluding the NUL
}
// duplicated from proc/escape.c so both can be made private
static int escape_str (char *dst, const char *src, int bufsize, int *maxcells) {
unsigned char c;
int my_cells = 0;
int my_bytes = 0;
const char codes[] =
"Z..............................."
"||||||||||||||||||||||||||||||||"
"||||||||||||||||||||||||||||||||"
"|||||||||||||||||||||||||||||||."
"????????????????????????????????"
"????????????????????????????????"
"????????????????????????????????"
"????????????????????????????????";
static int utf_init=0;
if(utf_init==0){
/* first call -- check if UTF stuff is usable */
char *enc = nl_langinfo(CODESET);
utf_init = enc && strcasecmp(enc, "UTF-8")==0 ? 1 : -1;
}
if (utf_init==1 && MB_CUR_MAX>1) {
/* UTF8 locales */
return escape_str_utf8(dst, src, bufsize, maxcells);
}
SECURE_ESCAPE_ARGS(dst, bufsize, *maxcells);
if(bufsize > *maxcells+1) bufsize=*maxcells+1; // FIXME: assumes 8-bit locale
for(;;){
if(my_cells >= *maxcells || my_bytes+1 >= bufsize)
break;
c = (unsigned char) *(src++);
if(!c) break;
if(codes[c]!='|') c=codes[c];
my_cells++;
my_bytes++;
*(dst++) = c;
}
*dst = '\0';
*maxcells -= my_cells;
return my_bytes; // bytes of text, excluding the NUL
}
procps 010114
2002-02-02 04:17:29 +05:30
/***************************************************************************/
/************ Lots of format functions, starting with the NOP **************/
more per-process stuff
2003-09-29 09:39:52 +05:30
// so popular it can't be "static"
int pr_nop(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(noop)
c99 for ps
2002-11-27 15:22:19 +05:30
(void)pp;
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%c", '-');
}
/********* Unix 98 ************/
/***
Only comm and args are allowed to contain blank characters; all others are
not. Any implementation-dependent variables will be specified in the system
documentation along with the default header and indicating if the field
may contain blank characters.
Some headers do not have a standardized specifier!
%CPU pcpu The % of cpu time used recently, with unspecified "recently".
ADDR The address of the process.
C Processor utilisation for scheduling.
CMD The command name, or everything with -f.
COMMAND args Command + args. May chop as desired. May use either version.
COMMAND comm argv[0]
ELAPSED etime Elapsed time since the process was started. [[dd-]hh:]mm:ss
F Flags (octal and additive)
GROUP group Effective group ID, prefer text over decimal.
NI nice Decimal system scheduling priority, see nice(1).
PGID pgid The decimal value of the process group ID.
PID pid Decimal PID.
PPID ppid Decimal PID.
PRI Priority. Higher numbers mean lower priority.
RGROUP rgroup Real group ID, prefer text over decimal.
RUSER ruser Real user ID, prefer text over decimal.
S The state of the process.
STIME Starting time of the process.
SZ The size in blocks of the core image of the process.
TIME time Cumulative CPU time. [dd-]hh:mm:ss
TT tty Name of tty in format used by who(1).
TTY The controlling terminal for the process.
UID UID, or name when -f
USER user Effective user ID, prefer text over decimal.
VSZ vsz Virtual memory size in decimal kB.
WCHAN Where waiting/sleeping or blank if running.
The nice value is used to compute the priority.
For some undefined ones, Digital does:
F flag Process flags -- but in hex!
PRI pri Process priority
S state Symbolic process status
TTY tt,tty,tname,longtname -- all do "ttyp1", "console", "??"
UID uid Process user ID (effective UID)
WCHAN wchan Address of event on which a
For some undefined ones, Sun does:
ADDR addr memory address of the process
C c Processor utilization for scheduling (obsolete).
CMD
F f
S s state: OSRZT
STIME start time, printed w/o blanks. If 24h old, months & days
SZ size (in pages) of the swappable process's image in main memory
TTY
UID uid
WCHAN wchan
For some undefined ones, SCO does:
ADDR addr Virtual address of the process' entry in the process table.
SZ swappable size in kB of the virtual data and stack
STIME stime hms or md time format
***/
/* Source & destination are known. Return bytes or screen characters? */
added ps etimes, miscellaneous top enhancements ps program . etimes added for ELAPSED expressed in seconds . time_t used in place of former unsigned long top program . corrected scroll message bug when 'x' toggle on . fixed forest view potential missing libflags bug . improved 'k' default signal invocation logic . enhanced logic for %CPU maximums displayed . made signal handling more robust and efficient
2011-09-12 17:48:23 +05:30
//
// OldLinux FreeBSD HPUX
// ' ' ' ' ' ' ' '
// 'L' ' \_ ' '`-' ' '
// '+' ' \_ ' '|-' ' '
// '|' ' | ' '| ' ' '
//
c99 for ps
2002-11-27 15:22:19 +05:30
static int forest_helper(char *restrict const outbuf){
procps 010114
2002-02-02 04:17:29 +05:30
char *p = forest_prefix;
char *q = outbuf;
0053-ps/output.c: Harden forest_helper(). This patch solves several problems: 1/ Limit the number of characters written (to outbuf) to OUTBUF_SIZE-1 (-1 for the null-terminator). 2/ Always null-terminate outbuf at q. 3/ Move the "rightward" checks *before* the strcpy() calls. 4/ Avoid an integer overflow in these checks (e.g., rightward-4).
1970-01-01 05:30:00 +05:30
int rightward = max_rightward < OUTBUF_SIZE ? max_rightward : OUTBUF_SIZE-1;
*q = '\0';
procps 010114
2002-02-02 04:17:29 +05:30
if(!*p) return 0;
/* Arrrgh! somebody defined unix as 1 */
if(forest_type == 'u') goto unixy;
while(*p){
0053-ps/output.c: Harden forest_helper(). This patch solves several problems: 1/ Limit the number of characters written (to outbuf) to OUTBUF_SIZE-1 (-1 for the null-terminator). 2/ Always null-terminate outbuf at q. 3/ Move the "rightward" checks *before* the strcpy() calls. 4/ Avoid an integer overflow in these checks (e.g., rightward-4).
1970-01-01 05:30:00 +05:30
if (rightward < 4) break;
procps 010114
2002-02-02 04:17:29 +05:30
switch(*p){
case ' ': strcpy(q, " "); break;
case 'L': strcpy(q, " \\_ "); break;
case '+': strcpy(q, " \\_ "); break;
case '|': strcpy(q, " | "); break;
case '\0': return q-outbuf; /* redundant & not used */
}
q += 4;
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
rightward -= 4;
procps 010114
2002-02-02 04:17:29 +05:30
p++;
}
return q-outbuf; /* gcc likes this here */
unixy:
while(*p){
0053-ps/output.c: Harden forest_helper(). This patch solves several problems: 1/ Limit the number of characters written (to outbuf) to OUTBUF_SIZE-1 (-1 for the null-terminator). 2/ Always null-terminate outbuf at q. 3/ Move the "rightward" checks *before* the strcpy() calls. 4/ Avoid an integer overflow in these checks (e.g., rightward-4).
1970-01-01 05:30:00 +05:30
if (rightward < 2) break;
procps 010114
2002-02-02 04:17:29 +05:30
switch(*p){
case ' ': strcpy(q, " "); break;
case 'L': strcpy(q, " "); break;
case '+': strcpy(q, " "); break;
case '|': strcpy(q, " "); break;
case '\0': return q-outbuf; /* redundant & not used */
}
q += 2;
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
rightward -= 2;
procps 010114
2002-02-02 04:17:29 +05:30
p++;
}
return q-outbuf; /* gcc likes this here */
}
/* XPG4-UNIX, according to Digital:
The "args" and "command" specifiers show what was passed to the command.
Modifications to the arguments are not shown.
*/
/*
* pp->cmd short accounting name (comm & ucomm)
* pp->cmdline long name with args (args & command)
* pp->environ environment
*/
proc/escape.c works for ps
2002-12-21 18:37:53 +05:30
// FIXME: some of these may hit the guard page in forest mode
0054-ps/output.c: Fix outbuf overflows in pr_args() etc. Because there is usually less than OUTBUF_SIZE available at endp. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' . ps no longer deals with the library 'FILL...' flags Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
#define OUTBUF_SIZE_AT(endp) \
(((endp) >= outbuf && (endp) < outbuf + OUTBUF_SIZE) ? (outbuf + OUTBUF_SIZE) - (endp) : 0)
enhanced libproc cgroup/cmdline support, exploited by top Library Changes . added PROC_EDITCMDLCVT flag . added an internal (static) fill_cmdline_cvt function: - reads and "escapes" /proc/#/cmdline - returns result as a single string in a single vector - callers are guaranteed a cmdline (no more NULL) . added vectorize_this_str function, exploited by fill_cgroup_cvt, fill_cmdline_cvt . generalized read_cmdline function as read_unvectored, now exploited by fill_cgroup_cvt, fill_cmdline_cvt, read_cmdline ( cgroup and cmdline no longer need be converted to string ) ( vectors before being transformed to final representation ) . fixed bug regarding skipped group numbers (when enabled) . escape_str made responsible for all single byte translation with distinction between control chars + other unprintable . added escaped_copy function for already escaped strings . reorganized parts of proc_t to restore formatting standards ( displacement changes shouldn't matter with new version # ) . former ZAP_SUSEONLY #define now OOMEM_ENABLE . added to library.map: escaped_copy; read_cmdline Top Program Changes . exploited the new PROC_EDITCMDLCVT provision . eliminated now obsolete #include "proc/escape.h" . changed the P_WCH display format if no kernel symbol table . fixed very old bug in lflgs for out-of-view sort fields . former ZAP_SUSEONLY #define now OOMEM_ENABLE Ps Program Changes . exploited the new PROC_EDITCMDLCVT provision . exploited the new escaped_copy function . consolidated pr_args and pr_comm into pr_argcom Signed-off-by: Jan Görig <jgorig@redhat.com>
2011-05-18 14:03:44 +05:30
/*
* "args", "cmd", "command" are all the same: long unless c
* "comm", "ucmd", "ucomm" are all the same: short unless -f
refined library i/f and improved performance Library changes readproc . added readeither to more efficiently fill both process and thread proc_t . added readproctab3, uses readeither . included task path support in: fill_cgroup_cvt, fill_cmdline_cvt, read_unvectored . QUICK_THREADS #define allows copying process info vs. repeatedly reading . simple_nexttid no longer values ppid . path var made non-static in readtask . documented 'proc_data_t' in .h file . tweaked some c comments & formatting library.map . added new readeither, readproctab3 Program changes ps . exploits readproctab3 where possible . improved args/comm compliance top . exploits readeither
2011-08-11 03:12:14 +05:30
* ( determinations are made in display.c, we mostly deal with results ) */
static int pr_args(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
char *endp;
int rightward, fh;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(CMDLINE,ENVIRON)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
endp = outbuf;
rightward = max_rightward;
ps: ensure functions not called prior to setREL macros Under newlib design, ps must loop though all potential print functions so as to gather the appropriate enum's while establishing the 'relative' equivalent. The keys to the setREL/chkREL macros are a NULL 'outbuf' param. It's imperative that no other functions be called with that NULL value. Unfortunately, several instances were found where this was violated. They are now corrected! Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
fh = forest_helper(outbuf);
added tgid support plus miscellaneous cleanup ps . added tgid support . made process/task naming consistent top . added tgid support . standardized pid related width logic documents . added tgid to ps & top man documents library . fixed OOMEM_ENABLE readtask bug . corrected header typo for tgid
2011-08-17 16:31:35 +05:30
endp += fh;
rightward -= fh;
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
endp += escape_str(endp, rSv(CMDLINE, str, pp), OUTBUF_SIZE_AT(endp), &rightward);
refined library i/f and improved performance Library changes readproc . added readeither to more efficiently fill both process and thread proc_t . added readproctab3, uses readeither . included task path support in: fill_cgroup_cvt, fill_cmdline_cvt, read_unvectored . QUICK_THREADS #define allows copying process info vs. repeatedly reading . simple_nexttid no longer values ppid . path var made non-static in readtask . documented 'proc_data_t' in .h file . tweaked some c comments & formatting library.map . added new readeither, readproctab3 Program changes ps . exploits readproctab3 where possible . improved args/comm compliance top . exploits readeither
2011-08-11 03:12:14 +05:30
if(bsd_e_option && rightward>1) {
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
char *e = rSv(ENVIRON, str, pp);
if(*e != '-' || *(e+1) != '\0') {
ps: restore missing space when environment is displayed This commit restores the missing space between command lines and the environment when the later is being displayed. Below is a brief history of that elusive character. commit bb4f08ba297a67a043f7547670aa8623b54c2e67 Date: Thu Aug 11 07:42:14 2011 +1000 The ps program was altered for improved args/comm compliance. At this time, the needed space was present due to a buglet in the new library read_unvectored function used by fill_cmdline_cvt. commit a5881b5a4e5056d13906ce6128f6aa180d67d60e Date: Thu Dec 8 10:19:38 2011 -0600 The trailing space was eliminated so that the file2strvec and fill_cmdline_cvt returned command lines contained no trailing space. However, this created a buglet when control group hierarchies were displayed and the final cgroup was empty. This is also where the undetected ps buglet was created. commit c3a1239efee4d720080f216547be4cd22253f861 Date: Sun Dec 11 12:00:50 2011 -0600 The control group anomaly was fixed but the impact on ps args/environ was still not detected. Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-06-26 10:29:59 +05:30
*endp++ = ' ';
rightward--;
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
escape_str(endp, e, OUTBUF_SIZE_AT(endp), &rightward);
ps: restore missing space when environment is displayed This commit restores the missing space between command lines and the environment when the later is being displayed. Below is a brief history of that elusive character. commit bb4f08ba297a67a043f7547670aa8623b54c2e67 Date: Thu Aug 11 07:42:14 2011 +1000 The ps program was altered for improved args/comm compliance. At this time, the needed space was present due to a buglet in the new library read_unvectored function used by fill_cmdline_cvt. commit a5881b5a4e5056d13906ce6128f6aa180d67d60e Date: Thu Dec 8 10:19:38 2011 -0600 The trailing space was eliminated so that the file2strvec and fill_cmdline_cvt returned command lines contained no trailing space. However, this created a buglet when control group hierarchies were displayed and the final cgroup was empty. This is also where the undetected ps buglet was created. commit c3a1239efee4d720080f216547be4cd22253f861 Date: Sun Dec 11 12:00:50 2011 -0600 The control group anomaly was fixed but the impact on ps args/environ was still not detected. Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-06-26 10:29:59 +05:30
}
refined library i/f and improved performance Library changes readproc . added readeither to more efficiently fill both process and thread proc_t . added readproctab3, uses readeither . included task path support in: fill_cgroup_cvt, fill_cmdline_cvt, read_unvectored . QUICK_THREADS #define allows copying process info vs. repeatedly reading . simple_nexttid no longer values ppid . path var made non-static in readtask . documented 'proc_data_t' in .h file . tweaked some c comments & formatting library.map . added new readeither, readproctab3 Program changes ps . exploits readproctab3 where possible . improved args/comm compliance top . exploits readeither
2011-08-11 03:12:14 +05:30
}
return max_rightward-rightward;
}
/*
* "args", "cmd", "command" are all the same: long unless c
* "comm", "ucmd", "ucomm" are all the same: short unless -f
* ( determinations are made in display.c, we mostly deal with results ) */
static int pr_comm(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
char *endp;
int rightward, fh;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL3(CMD,CMDLINE,ENVIRON)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
endp = outbuf;
rightward = max_rightward;
ps: ensure functions not called prior to setREL macros Under newlib design, ps must loop though all potential print functions so as to gather the appropriate enum's while establishing the 'relative' equivalent. The keys to the setREL/chkREL macros are a NULL 'outbuf' param. It's imperative that no other functions be called with that NULL value. Unfortunately, several instances were found where this was violated. They are now corrected! Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
fh = forest_helper(outbuf);
added tgid support plus miscellaneous cleanup ps . added tgid support . made process/task naming consistent top . added tgid support . standardized pid related width logic documents . added tgid to ps & top man documents library . fixed OOMEM_ENABLE readtask bug . corrected header typo for tgid
2011-08-17 16:31:35 +05:30
endp += fh;
rightward -= fh;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(unix_f_option)
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
endp += escape_str(endp, rSv(CMDLINE, str, pp), OUTBUF_SIZE_AT(endp), &rightward);
enhanced libproc cgroup/cmdline support, exploited by top Library Changes . added PROC_EDITCMDLCVT flag . added an internal (static) fill_cmdline_cvt function: - reads and "escapes" /proc/#/cmdline - returns result as a single string in a single vector - callers are guaranteed a cmdline (no more NULL) . added vectorize_this_str function, exploited by fill_cgroup_cvt, fill_cmdline_cvt . generalized read_cmdline function as read_unvectored, now exploited by fill_cgroup_cvt, fill_cmdline_cvt, read_cmdline ( cgroup and cmdline no longer need be converted to string ) ( vectors before being transformed to final representation ) . fixed bug regarding skipped group numbers (when enabled) . escape_str made responsible for all single byte translation with distinction between control chars + other unprintable . added escaped_copy function for already escaped strings . reorganized parts of proc_t to restore formatting standards ( displacement changes shouldn't matter with new version # ) . former ZAP_SUSEONLY #define now OOMEM_ENABLE . added to library.map: escaped_copy; read_cmdline Top Program Changes . exploited the new PROC_EDITCMDLCVT provision . eliminated now obsolete #include "proc/escape.h" . changed the P_WCH display format if no kernel symbol table . fixed very old bug in lflgs for out-of-view sort fields . former ZAP_SUSEONLY #define now OOMEM_ENABLE Ps Program Changes . exploited the new PROC_EDITCMDLCVT provision . exploited the new escaped_copy function . consolidated pr_args and pr_comm into pr_argcom Signed-off-by: Jan Görig <jgorig@redhat.com>
2011-05-18 14:03:44 +05:30
else
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
endp += escape_str(endp, rSv(CMD, str, pp), OUTBUF_SIZE_AT(endp), &rightward);
enhanced libproc cgroup/cmdline support, exploited by top Library Changes . added PROC_EDITCMDLCVT flag . added an internal (static) fill_cmdline_cvt function: - reads and "escapes" /proc/#/cmdline - returns result as a single string in a single vector - callers are guaranteed a cmdline (no more NULL) . added vectorize_this_str function, exploited by fill_cgroup_cvt, fill_cmdline_cvt . generalized read_cmdline function as read_unvectored, now exploited by fill_cgroup_cvt, fill_cmdline_cvt, read_cmdline ( cgroup and cmdline no longer need be converted to string ) ( vectors before being transformed to final representation ) . fixed bug regarding skipped group numbers (when enabled) . escape_str made responsible for all single byte translation with distinction between control chars + other unprintable . added escaped_copy function for already escaped strings . reorganized parts of proc_t to restore formatting standards ( displacement changes shouldn't matter with new version # ) . former ZAP_SUSEONLY #define now OOMEM_ENABLE . added to library.map: escaped_copy; read_cmdline Top Program Changes . exploited the new PROC_EDITCMDLCVT provision . eliminated now obsolete #include "proc/escape.h" . changed the P_WCH display format if no kernel symbol table . fixed very old bug in lflgs for out-of-view sort fields . former ZAP_SUSEONLY #define now OOMEM_ENABLE Ps Program Changes . exploited the new PROC_EDITCMDLCVT provision . exploited the new escaped_copy function . consolidated pr_args and pr_comm into pr_argcom Signed-off-by: Jan Görig <jgorig@redhat.com>
2011-05-18 14:03:44 +05:30
if(bsd_e_option && rightward>1) {
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
char *e = rSv(ENVIRON, str, pp);
if(*e != '-' || *(e+1) != '\0') {
ps: restore missing space when environment is displayed This commit restores the missing space between command lines and the environment when the later is being displayed. Below is a brief history of that elusive character. commit bb4f08ba297a67a043f7547670aa8623b54c2e67 Date: Thu Aug 11 07:42:14 2011 +1000 The ps program was altered for improved args/comm compliance. At this time, the needed space was present due to a buglet in the new library read_unvectored function used by fill_cmdline_cvt. commit a5881b5a4e5056d13906ce6128f6aa180d67d60e Date: Thu Dec 8 10:19:38 2011 -0600 The trailing space was eliminated so that the file2strvec and fill_cmdline_cvt returned command lines contained no trailing space. However, this created a buglet when control group hierarchies were displayed and the final cgroup was empty. This is also where the undetected ps buglet was created. commit c3a1239efee4d720080f216547be4cd22253f861 Date: Sun Dec 11 12:00:50 2011 -0600 The control group anomaly was fixed but the impact on ps args/environ was still not detected. Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-06-26 10:29:59 +05:30
*endp++ = ' ';
rightward--;
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
escape_str(endp, e, OUTBUF_SIZE_AT(endp), &rightward);
ps: restore missing space when environment is displayed This commit restores the missing space between command lines and the environment when the later is being displayed. Below is a brief history of that elusive character. commit bb4f08ba297a67a043f7547670aa8623b54c2e67 Date: Thu Aug 11 07:42:14 2011 +1000 The ps program was altered for improved args/comm compliance. At this time, the needed space was present due to a buglet in the new library read_unvectored function used by fill_cmdline_cvt. commit a5881b5a4e5056d13906ce6128f6aa180d67d60e Date: Thu Dec 8 10:19:38 2011 -0600 The trailing space was eliminated so that the file2strvec and fill_cmdline_cvt returned command lines contained no trailing space. However, this created a buglet when control group hierarchies were displayed and the final cgroup was empty. This is also where the undetected ps buglet was created. commit c3a1239efee4d720080f216547be4cd22253f861 Date: Sun Dec 11 12:00:50 2011 -0600 The control group anomaly was fixed but the impact on ps args/environ was still not detected. Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-06-26 10:29:59 +05:30
}
procps 010114
2002-02-02 04:17:29 +05:30
}
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
return max_rightward-rightward;
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: exploits <pids> enhancement for control group name [ but stay tuned! there is a commit coming soon that ] [ represents a rather major internal redesign, which ] [ was prompted by the ps and top adaptation testing. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-12 10:30:00 +05:30
static int pr_cgname(char *restrict const outbuf,const proc_t *restrict const pp) {
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
int rightward;
ps: exploits <pids> enhancement for control group name [ but stay tuned! there is a commit coming soon that ] [ represents a rather major internal redesign, which ] [ was prompted by the ps and top adaptation testing. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-12 10:30:00 +05:30
setREL1(CGNAME)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
rightward = max_rightward;
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
escape_str(outbuf, rSv(CGNAME, str, pp), OUTBUF_SIZE, &rightward);
ps: exploit library changes to cgroup & supgid Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-06-28 10:30:02 +05:30
return max_rightward-rightward;
ps displays cgroup Author: Swann Perarnau <swann.perarnau@imag.fr> Bug-Debian: http://bugs.debian.org/469669 Reviewed-by: Craig Small <csmall@debian.org>
2010-12-16 14:53:49 +05:30
}
ps: exploits <pids> enhancement for control group name [ but stay tuned! there is a commit coming soon that ] [ represents a rather major internal redesign, which ] [ was prompted by the ps and top adaptation testing. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-12 10:30:00 +05:30
static int pr_cgroup(char *restrict const outbuf,const proc_t *restrict const pp) {
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
int rightward;
ps: display control group name The cgroup field while shown as a vector is a concatenated string, so alot of the complexity of sorting and displaying has gone. This change simplifies the cgroup sorting and adds display and sorting for the name attribute of the cgroup, if found. Signed-off-by: Craig Small <csmall@enc.com.au> Ported-by: Jim Warner <james.warner@comcast.net> From original: commit 0ee090ae16a3a98ba64a1bb8108597328a4c05b0
2015-08-15 12:40:38 +05:30
setREL1(CGROUP)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
rightward = max_rightward;
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
escape_str(outbuf, rSv(CGROUP, str, pp), OUTBUF_SIZE, &rightward);
ps: exploits <pids> enhancement for control group name [ but stay tuned! there is a commit coming soon that ] [ represents a rather major internal redesign, which ] [ was prompted by the ps and top adaptation testing. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-12 10:30:00 +05:30
return max_rightward-rightward;
ps: display control group name The cgroup field while shown as a vector is a concatenated string, so alot of the complexity of sorting and displaying has gone. This change simplifies the cgroup sorting and adds display and sorting for the name attribute of the cgroup, if found. Signed-off-by: Craig Small <csmall@enc.com.au> Ported-by: Jim Warner <james.warner@comcast.net> From original: commit 0ee090ae16a3a98ba64a1bb8108597328a4c05b0
2015-08-15 12:40:38 +05:30
}
procps 010114
2002-02-02 04:17:29 +05:30
/* Non-standard, from SunOS 5 */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_fname(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
char *endp;
int rightward, fh;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(CMD)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
endp = outbuf;
rightward = max_rightward;
ps: ensure functions not called prior to setREL macros Under newlib design, ps must loop though all potential print functions so as to gather the appropriate enum's while establishing the 'relative' equivalent. The keys to the setREL/chkREL macros are a NULL 'outbuf' param. It's imperative that no other functions be called with that NULL value. Unfortunately, several instances were found where this was violated. They are now corrected! Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
fh = forest_helper(outbuf);
added tgid support plus miscellaneous cleanup ps . added tgid support . made process/task naming consistent top . added tgid support . standardized pid related width logic documents . added tgid to ps & top man documents library . fixed OOMEM_ENABLE readtask bug . corrected header typo for tgid
2011-08-17 16:31:35 +05:30
endp += fh;
rightward -= fh;
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
if (rightward>8) /* 8=default, but forest maybe feeds more */
rightward = 8;
0054-ps/output.c: Fix outbuf overflows in pr_args() etc. Because there is usually less than OUTBUF_SIZE available at endp. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' . ps no longer deals with the library 'FILL...' flags Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
endp += escape_str(endp, rSv(CMD, str, pp), OUTBUF_SIZE_AT(endp), &rightward);
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
//return endp - outbuf;
return max_rightward-rightward;
procps 010114
2002-02-02 04:17:29 +05:30
}
0054-ps/output.c: Fix outbuf overflows in pr_args() etc. Because there is usually less than OUTBUF_SIZE available at endp. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' . ps no longer deals with the library 'FILL...' flags Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
#undef OUTBUF_SIZE_AT
procps 010114
2002-02-02 04:17:29 +05:30
/* elapsed wall clock time, [[dd-]hh:]mm:ss format (not same as "time") */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_etime(char *restrict const outbuf, const proc_t *restrict const pp){
SMP fix, speed, hide IO-wait, dumb/VT510 terms
2002-10-19 02:37:49 +05:30
unsigned long t;
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
unsigned dd,hh,mm,ss;
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
char *cp;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(TIME_ELAPSED)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
cp = outbuf;
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
t = rSv(TIME_ELAPSED, real, pp);
procps 010114
2002-02-02 04:17:29 +05:30
ss = t%60;
t /= 60;
mm = t%60;
t /= 60;
hh = t%24;
t /= 24;
dd = t;
cp +=( dd ? snprintf(cp, COLWID, "%u-", dd) : 0 );
cp +=( (dd || hh) ? snprintf(cp, COLWID, "%02u:", hh) : 0 );
cp += snprintf(cp, COLWID, "%02u:%02u", mm, ss) ;
return (int)(cp-outbuf);
}
added ps etimes, miscellaneous top enhancements ps program . etimes added for ELAPSED expressed in seconds . time_t used in place of former unsigned long top program . corrected scroll message bug when 'x' toggle on . fixed forest view potential missing libflags bug . improved 'k' default signal invocation logic . enhanced logic for %CPU maximums displayed . made signal handling more robust and efficient
2011-09-12 17:48:23 +05:30
/* elapsed wall clock time in seconds */
static int pr_etimes(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
unsigned t;
setREL1(TIME_ELAPSED)
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
t = rSv(TIME_ELAPSED, real, pp);
added ps etimes, miscellaneous top enhancements ps program . etimes added for ELAPSED expressed in seconds . time_t used in place of former unsigned long top program . corrected scroll message bug when 'x' toggle on . fixed forest view potential missing libflags bug . improved 'k' default signal invocation logic . enhanced logic for %CPU maximums displayed . made signal handling more robust and efficient
2011-09-12 17:48:23 +05:30
return snprintf(outbuf, COLWID, "%u", t);
}
procps 010114
2002-02-02 04:17:29 +05:30
/* "Processor utilisation for scheduling." --- we use %cpu w/o fraction */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_c(char *restrict const outbuf, const proc_t *restrict const pp){
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
unsigned long long total_time; /* jiffies used by this process */
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
unsigned pcpu; /* scaled %cpu, 99 means 99% */
ps: improved three elapsed 'jiffies/tics' calculations With openSUSE's tumbleweed release of procps-ng-4.0.0, their source rpm contained a questionable patch. It is ostensibly devoted to increasing the accuracy for %cpu calculations in the ps program. However, in my opinion it goes too far and is quite flawed for these reasons: 1. Six separate files were impacted instead of just 1. 2. While ps was the object, libproc-2 was changed too. 3. A header file's alphabetic item order was violated. 4. The library API and ABI were altered unnecessarily. It should be noted that all the <pids> TIME items were made 'real' when representing seconds so that they can be converted into jiffies/tics if multiplied by hertz. Thus, there was absolutely no justification for adding a new PIDS_TICS_ELAPSED ull_int item to the interface. As an example, assuming a hertz value of 100, there is enough capacity in all of those 'TIME' seconds to hold nearly 3 million years worth of tics without a loss of precision whenever they are changed back into jiffies. [ that's nine quadrillion seven trillion one hundred ] [ ninety-nine billion two hundred fifty-four million ] [ seven hundred forty thousand nine hundred ninety + ] [ one! or more concisely, as: 9,007,199,254,740,991. ] So, any need for increased accuracy in that ps program can be realized within the single output.c file alone. That's what will be accomplished with this new commit. And for any doubters here's a 'double' capacity proof: beg ------ 9007199254740991.000000000000000000000 tic| d /= 100, 90071992547409.90625000000000000000000 sec d /= 60, 1501199875790.165039062500000000000000 min d /= 60, 25019997929.83608245849609375000000000 hrs d /= 24, 1042499913.743170142173767089843750000 day d /= 7, 148928559.1061671674251556396484375000 wks d /= 52, 2864010.752041676081717014312744140625 yrs d *= 52, 148928559.1061671674251556396484375000 wks d *= 7, 1042499913.743170142173767089843750000 day d *= 24, 25019997929.83608245849609375000000000 hrs d *= 60, 1501199875790.165039062500000000000000 min d *= 60, 90071992547409.90625000000000000000000 sec d *= 100, 9007199254740991.000000000000000000000 tic end ------ 9007199254740991.000000000000000000000 " | [ who knows, maybe we'll even convince openSUSE that ] [ the original sledgehammer 'dif' should be dropped. ] Reference(s): . openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif' Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-15 10:30:00 +05:30
unsigned long long jiffies; /* jiffies of process life */
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
setREL4(TICS_ALL,TICS_ALL_C,TIME_ELAPSED,UTILIZATION)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
pcpu = 0;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(include_dead_children) total_time = rSv(TICS_ALL_C, ull_int, pp);
else total_time = rSv(TICS_ALL, ull_int, pp);
ps: improved three elapsed 'jiffies/tics' calculations With openSUSE's tumbleweed release of procps-ng-4.0.0, their source rpm contained a questionable patch. It is ostensibly devoted to increasing the accuracy for %cpu calculations in the ps program. However, in my opinion it goes too far and is quite flawed for these reasons: 1. Six separate files were impacted instead of just 1. 2. While ps was the object, libproc-2 was changed too. 3. A header file's alphabetic item order was violated. 4. The library API and ABI were altered unnecessarily. It should be noted that all the <pids> TIME items were made 'real' when representing seconds so that they can be converted into jiffies/tics if multiplied by hertz. Thus, there was absolutely no justification for adding a new PIDS_TICS_ELAPSED ull_int item to the interface. As an example, assuming a hertz value of 100, there is enough capacity in all of those 'TIME' seconds to hold nearly 3 million years worth of tics without a loss of precision whenever they are changed back into jiffies. [ that's nine quadrillion seven trillion one hundred ] [ ninety-nine billion two hundred fifty-four million ] [ seven hundred forty thousand nine hundred ninety + ] [ one! or more concisely, as: 9,007,199,254,740,991. ] So, any need for increased accuracy in that ps program can be realized within the single output.c file alone. That's what will be accomplished with this new commit. And for any doubters here's a 'double' capacity proof: beg ------ 9007199254740991.000000000000000000000 tic| d /= 100, 90071992547409.90625000000000000000000 sec d /= 60, 1501199875790.165039062500000000000000 min d /= 60, 25019997929.83608245849609375000000000 hrs d /= 24, 1042499913.743170142173767089843750000 day d /= 7, 148928559.1061671674251556396484375000 wks d /= 52, 2864010.752041676081717014312744140625 yrs d *= 52, 148928559.1061671674251556396484375000 wks d *= 7, 1042499913.743170142173767089843750000 day d *= 24, 25019997929.83608245849609375000000000 hrs d *= 60, 1501199875790.165039062500000000000000 min d *= 60, 90071992547409.90625000000000000000000 sec d *= 100, 9007199254740991.000000000000000000000 tic end ------ 9007199254740991.000000000000000000000 " | [ who knows, maybe we'll even convince openSUSE that ] [ the original sledgehammer 'dif' should be dropped. ] Reference(s): . openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif' Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-15 10:30:00 +05:30
jiffies = rSv(TIME_ELAPSED, real, pp) * Hertz;
if(jiffies) pcpu = (total_time * 100ULL) / jiffies;
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
if (pcpu > 99U) pcpu = 99U;
return snprintf(outbuf, COLWID, "%2u", pcpu);
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
/* normal %CPU in ##.# format. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_pcpu(char *restrict const outbuf, const proc_t *restrict const pp){
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
unsigned long long total_time; /* jiffies used by this process */
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
unsigned pcpu; /* scaled %cpu, 999 means 99.9% */
ps: improved three elapsed 'jiffies/tics' calculations With openSUSE's tumbleweed release of procps-ng-4.0.0, their source rpm contained a questionable patch. It is ostensibly devoted to increasing the accuracy for %cpu calculations in the ps program. However, in my opinion it goes too far and is quite flawed for these reasons: 1. Six separate files were impacted instead of just 1. 2. While ps was the object, libproc-2 was changed too. 3. A header file's alphabetic item order was violated. 4. The library API and ABI were altered unnecessarily. It should be noted that all the <pids> TIME items were made 'real' when representing seconds so that they can be converted into jiffies/tics if multiplied by hertz. Thus, there was absolutely no justification for adding a new PIDS_TICS_ELAPSED ull_int item to the interface. As an example, assuming a hertz value of 100, there is enough capacity in all of those 'TIME' seconds to hold nearly 3 million years worth of tics without a loss of precision whenever they are changed back into jiffies. [ that's nine quadrillion seven trillion one hundred ] [ ninety-nine billion two hundred fifty-four million ] [ seven hundred forty thousand nine hundred ninety + ] [ one! or more concisely, as: 9,007,199,254,740,991. ] So, any need for increased accuracy in that ps program can be realized within the single output.c file alone. That's what will be accomplished with this new commit. And for any doubters here's a 'double' capacity proof: beg ------ 9007199254740991.000000000000000000000 tic| d /= 100, 90071992547409.90625000000000000000000 sec d /= 60, 1501199875790.165039062500000000000000 min d /= 60, 25019997929.83608245849609375000000000 hrs d /= 24, 1042499913.743170142173767089843750000 day d /= 7, 148928559.1061671674251556396484375000 wks d /= 52, 2864010.752041676081717014312744140625 yrs d *= 52, 148928559.1061671674251556396484375000 wks d *= 7, 1042499913.743170142173767089843750000 day d *= 24, 25019997929.83608245849609375000000000 hrs d *= 60, 1501199875790.165039062500000000000000 min d *= 60, 90071992547409.90625000000000000000000 sec d *= 100, 9007199254740991.000000000000000000000 tic end ------ 9007199254740991.000000000000000000000 " | [ who knows, maybe we'll even convince openSUSE that ] [ the original sledgehammer 'dif' should be dropped. ] Reference(s): . openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif' Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-15 10:30:00 +05:30
unsigned long long jiffies; /* jiffies of process life */
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
setREL4(TICS_ALL,TICS_ALL_C,TIME_ELAPSED,UTILIZATION)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
pcpu = 0;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(include_dead_children) total_time = rSv(TICS_ALL_C, ull_int, pp);
else total_time = rSv(TICS_ALL, ull_int, pp);
ps: improved three elapsed 'jiffies/tics' calculations With openSUSE's tumbleweed release of procps-ng-4.0.0, their source rpm contained a questionable patch. It is ostensibly devoted to increasing the accuracy for %cpu calculations in the ps program. However, in my opinion it goes too far and is quite flawed for these reasons: 1. Six separate files were impacted instead of just 1. 2. While ps was the object, libproc-2 was changed too. 3. A header file's alphabetic item order was violated. 4. The library API and ABI were altered unnecessarily. It should be noted that all the <pids> TIME items were made 'real' when representing seconds so that they can be converted into jiffies/tics if multiplied by hertz. Thus, there was absolutely no justification for adding a new PIDS_TICS_ELAPSED ull_int item to the interface. As an example, assuming a hertz value of 100, there is enough capacity in all of those 'TIME' seconds to hold nearly 3 million years worth of tics without a loss of precision whenever they are changed back into jiffies. [ that's nine quadrillion seven trillion one hundred ] [ ninety-nine billion two hundred fifty-four million ] [ seven hundred forty thousand nine hundred ninety + ] [ one! or more concisely, as: 9,007,199,254,740,991. ] So, any need for increased accuracy in that ps program can be realized within the single output.c file alone. That's what will be accomplished with this new commit. And for any doubters here's a 'double' capacity proof: beg ------ 9007199254740991.000000000000000000000 tic| d /= 100, 90071992547409.90625000000000000000000 sec d /= 60, 1501199875790.165039062500000000000000 min d /= 60, 25019997929.83608245849609375000000000 hrs d /= 24, 1042499913.743170142173767089843750000 day d /= 7, 148928559.1061671674251556396484375000 wks d /= 52, 2864010.752041676081717014312744140625 yrs d *= 52, 148928559.1061671674251556396484375000 wks d *= 7, 1042499913.743170142173767089843750000 day d *= 24, 25019997929.83608245849609375000000000 hrs d *= 60, 1501199875790.165039062500000000000000 min d *= 60, 90071992547409.90625000000000000000000 sec d *= 100, 9007199254740991.000000000000000000000 tic end ------ 9007199254740991.000000000000000000000 " | [ who knows, maybe we'll even convince openSUSE that ] [ the original sledgehammer 'dif' should be dropped. ] Reference(s): . openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif' Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-15 10:30:00 +05:30
jiffies = rSv(TIME_ELAPSED, real, pp) * Hertz;
if(jiffies) pcpu = (total_time * 1000ULL) / jiffies;
%cpu and other changes
2004-09-12 21:13:48 +05:30
if (pcpu > 999U)
return snprintf(outbuf, COLWID, "%u", pcpu/10U);
return snprintf(outbuf, COLWID, "%u.%u", pcpu/10U, pcpu%10U);
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
/* this is a "per-mill" format, like %cpu with no decimal point */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_cp(char *restrict const outbuf, const proc_t *restrict const pp){
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
unsigned long long total_time; /* jiffies used by this process */
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
unsigned pcpu; /* scaled %cpu, 999 means 99.9% */
ps: improved three elapsed 'jiffies/tics' calculations With openSUSE's tumbleweed release of procps-ng-4.0.0, their source rpm contained a questionable patch. It is ostensibly devoted to increasing the accuracy for %cpu calculations in the ps program. However, in my opinion it goes too far and is quite flawed for these reasons: 1. Six separate files were impacted instead of just 1. 2. While ps was the object, libproc-2 was changed too. 3. A header file's alphabetic item order was violated. 4. The library API and ABI were altered unnecessarily. It should be noted that all the <pids> TIME items were made 'real' when representing seconds so that they can be converted into jiffies/tics if multiplied by hertz. Thus, there was absolutely no justification for adding a new PIDS_TICS_ELAPSED ull_int item to the interface. As an example, assuming a hertz value of 100, there is enough capacity in all of those 'TIME' seconds to hold nearly 3 million years worth of tics without a loss of precision whenever they are changed back into jiffies. [ that's nine quadrillion seven trillion one hundred ] [ ninety-nine billion two hundred fifty-four million ] [ seven hundred forty thousand nine hundred ninety + ] [ one! or more concisely, as: 9,007,199,254,740,991. ] So, any need for increased accuracy in that ps program can be realized within the single output.c file alone. That's what will be accomplished with this new commit. And for any doubters here's a 'double' capacity proof: beg ------ 9007199254740991.000000000000000000000 tic| d /= 100, 90071992547409.90625000000000000000000 sec d /= 60, 1501199875790.165039062500000000000000 min d /= 60, 25019997929.83608245849609375000000000 hrs d /= 24, 1042499913.743170142173767089843750000 day d /= 7, 148928559.1061671674251556396484375000 wks d /= 52, 2864010.752041676081717014312744140625 yrs d *= 52, 148928559.1061671674251556396484375000 wks d *= 7, 1042499913.743170142173767089843750000 day d *= 24, 25019997929.83608245849609375000000000 hrs d *= 60, 1501199875790.165039062500000000000000 min d *= 60, 90071992547409.90625000000000000000000 sec d *= 100, 9007199254740991.000000000000000000000 tic end ------ 9007199254740991.000000000000000000000 " | [ who knows, maybe we'll even convince openSUSE that ] [ the original sledgehammer 'dif' should be dropped. ] Reference(s): . openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif' Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-15 10:30:00 +05:30
unsigned long long jiffies; /* jiffies of process life */
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
setREL4(TICS_ALL,TICS_ALL_C,TIME_ELAPSED,UTILIZATION)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
pcpu = 0;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(include_dead_children) total_time = rSv(TICS_ALL_C, ull_int, pp);
else total_time = rSv(TICS_ALL, ull_int, pp);
ps: improved three elapsed 'jiffies/tics' calculations With openSUSE's tumbleweed release of procps-ng-4.0.0, their source rpm contained a questionable patch. It is ostensibly devoted to increasing the accuracy for %cpu calculations in the ps program. However, in my opinion it goes too far and is quite flawed for these reasons: 1. Six separate files were impacted instead of just 1. 2. While ps was the object, libproc-2 was changed too. 3. A header file's alphabetic item order was violated. 4. The library API and ABI were altered unnecessarily. It should be noted that all the <pids> TIME items were made 'real' when representing seconds so that they can be converted into jiffies/tics if multiplied by hertz. Thus, there was absolutely no justification for adding a new PIDS_TICS_ELAPSED ull_int item to the interface. As an example, assuming a hertz value of 100, there is enough capacity in all of those 'TIME' seconds to hold nearly 3 million years worth of tics without a loss of precision whenever they are changed back into jiffies. [ that's nine quadrillion seven trillion one hundred ] [ ninety-nine billion two hundred fifty-four million ] [ seven hundred forty thousand nine hundred ninety + ] [ one! or more concisely, as: 9,007,199,254,740,991. ] So, any need for increased accuracy in that ps program can be realized within the single output.c file alone. That's what will be accomplished with this new commit. And for any doubters here's a 'double' capacity proof: beg ------ 9007199254740991.000000000000000000000 tic| d /= 100, 90071992547409.90625000000000000000000 sec d /= 60, 1501199875790.165039062500000000000000 min d /= 60, 25019997929.83608245849609375000000000 hrs d /= 24, 1042499913.743170142173767089843750000 day d /= 7, 148928559.1061671674251556396484375000 wks d /= 52, 2864010.752041676081717014312744140625 yrs d *= 52, 148928559.1061671674251556396484375000 wks d *= 7, 1042499913.743170142173767089843750000 day d *= 24, 25019997929.83608245849609375000000000 hrs d *= 60, 1501199875790.165039062500000000000000 min d *= 60, 90071992547409.90625000000000000000000 sec d *= 100, 9007199254740991.000000000000000000000 tic end ------ 9007199254740991.000000000000000000000 " | [ who knows, maybe we'll even convince openSUSE that ] [ the original sledgehammer 'dif' should be dropped. ] Reference(s): . openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif' Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-15 10:30:00 +05:30
jiffies = rSv(TIME_ELAPSED, real, pp) * Hertz;
if(jiffies) pcpu = (total_time * 1000ULL) / jiffies;
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
if (pcpu > 999U) pcpu = 999U;
return snprintf(outbuf, COLWID, "%3u", pcpu);
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_pgid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_PGRP)
return snprintf(outbuf, COLWID, "%u", rSv(ID_PGRP, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_ppid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_PPID)
return snprintf(outbuf, COLWID, "%u", rSv(ID_PPID, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
/* cumulative CPU time, [dd-]hh:mm:ss format (not same as "etime") */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_time(char *restrict const outbuf, const proc_t *restrict const pp){
SMP fix, speed, hide IO-wait, dumb/VT510 terms
2002-10-19 02:37:49 +05:30
unsigned long t;
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
unsigned dd,hh,mm,ss;
procps 010114
2002-02-02 04:17:29 +05:30
int c;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(TIME_ALL)
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
t = rSv(TIME_ALL, real, pp);
procps 010114
2002-02-02 04:17:29 +05:30
ss = t%60;
t /= 60;
mm = t%60;
t /= 60;
hh = t%24;
t /= 24;
dd = t;
c =( dd ? snprintf(outbuf, COLWID, "%u-", dd) : 0 );
c +=( snprintf(outbuf+c, COLWID, "%02u:%02u:%02u", hh, mm, ss) );
return c;
}
ps: add times & cputimes format specifiers: cumulative CPU time in seconds These format specifiers are to time & cputime what etimes is to etime. Signed-off-by: Sébastien Bigaret <sebastien.bigaret@telecom-bretagne.eu> References: procps-ng/procps!43
2017-03-11 12:10:19 +05:30
/* cumulative CPU time in seconds (not same as "etimes") */
static int pr_times(char *restrict const outbuf, const proc_t *restrict const pp){
unsigned long t;
setREL1(TIME_ALL)
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
t = rSv(TIME_ALL, real, pp);
ps/output.c: eliminate one irritating compiler warning Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", t);
ps: add times & cputimes format specifiers: cumulative CPU time in seconds These format specifiers are to time & cputime what etimes is to etime. Signed-off-by: Sébastien Bigaret <sebastien.bigaret@telecom-bretagne.eu> References: procps-ng/procps!43
2017-03-11 12:10:19 +05:30
}
procps 010114
2002-02-02 04:17:29 +05:30
/* HP-UX puts this (I forget, vsz or vsize?) in kB and uses "sz" for pages.
* Unix98 requires "vsz" to be kB.
* Tru64 does both vsize and vsz like "1.23M"
*
* Our pp->vm_size is kB and our pp->vsize is pages.
*
* TODO: add flag for "1.23M" behavior, on this and other columns.
*/
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_vsz(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(VM_SIZE)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", rSv(VM_SIZE, ul_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
%cpu and other changes
2004-09-12 21:13:48 +05:30
//////////////////////////////////////////////////////////////////////////////////////
procps 010114
2002-02-02 04:17:29 +05:30
rh109147-like bug w/ old data in buffer, plus ")" problem and speed
2004-07-28 20:49:46 +05:30
// "PRI" is created by "opri", or by "pri" when -c is used.
//
// Unix98 only specifies that a high "PRI" is low priority.
// Sun and SCO add the -c behavior. Sun defines "pri" and "opri".
// Linux may use "priority" for historical purposes.
//
// According to the kernel's fs/proc/array.c and kernel/sched.c source,
// the kernel reports it in /proc via this:
// p->prio - MAX_RT_PRIO
// such that "RT tasks are offset by -200. Normal tasks are centered
// around 0, value goes from -16 to +15" but who knows if that is
// before or after the conversion...
//
// <linux/sched.h> says:
// MAX_RT_PRIO is currently 100. (so we see 0 in /proc)
// RT tasks have a p->prio of 0 to 99. (so we see -100 to -1)
// non-RT tasks are from 100 to 139. (so we see 0 to 39)
// Lower values have higher priority, as in the UNIX standard.
//
// In any case, pp->priority+100 should get us back to what the kernel
// has for p->prio.
//
// Test results with the "yes" program on a 2.6.x kernel:
//
// # ps -C19,_20 -o pri,opri,intpri,priority,ni,pcpu,pid,comm
// PRI PRI PRI PRI NI %CPU PID COMMAND
// 0 99 99 39 19 10.6 8686 19
// 34 65 65 5 -20 94.7 8687 _20
//
// Grrr. So the UNIX standard "PRI" must NOT be from "pri".
// Either of the others will do. We use "opri" for this.
// (and use "pri" when the "-c" option is used)
// Probably we should have Linux-specific "pri_for_l" and "pri_for_lc"
//
// sched_get_priority_min.2 says the Linux static priority is
// 1..99 for RT and 0 for other... maybe 100 is kernel-only?
//
// A nice range would be -99..0 for RT and 1..40 for normal,
// which is pp->priority+1. (3-digit max, positive is normal,
// negative or 0 is RT, and meets the standard for PRI)
//
%cpu and other changes
2004-09-12 21:13:48 +05:30
// legal as UNIX "PRI"
rh109147-like bug w/ old data in buffer, plus ")" problem and speed
2004-07-28 20:49:46 +05:30
// "priority" (was -20..20, now -100..39)
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_priority(char *restrict const outbuf, const proc_t *restrict const pp){ /* -20..20 */
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", rSv(PRIORITY, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
%cpu and other changes
2004-09-12 21:13:48 +05:30
// legal as UNIX "PRI"
// "intpri" and "opri" (was 39..79, now -40..99)
static int pr_opri(char *restrict const outbuf, const proc_t *restrict const pp){ /* 39..79 */
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", 60 + rSv(PRIORITY, s_int, pp));
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
// legal as UNIX "PRI"
// "pri_foo" -- match up w/ nice values of sleeping processes (-120..19)
static int pr_pri_foo(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", rSv(PRIORITY, s_int, pp) - 20);
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
// legal as UNIX "PRI"
// "pri_bar" -- makes RT pri show as negative (-99..40)
static int pr_pri_bar(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", rSv(PRIORITY, s_int, pp) + 1);
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
// legal as UNIX "PRI"
// "pri_baz" -- the kernel's ->prio value, as of Linux 2.6.8 (1..140)
static int pr_pri_baz(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", rSv(PRIORITY, s_int, pp) + 100);
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
// not legal as UNIX "PRI"
rh109147-like bug w/ old data in buffer, plus ")" problem and speed
2004-07-28 20:49:46 +05:30
// "pri" (was 20..60, now 0..139)
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_pri(char *restrict const outbuf, const proc_t *restrict const pp){ /* 20..60 */
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", 39 - rSv(PRIORITY, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
%cpu and other changes
2004-09-12 21:13:48 +05:30
// not legal as UNIX "PRI"
// "pri_api" -- match up w/ RT API (-40..99)
static int pr_pri_api(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PRIORITY)
return snprintf(outbuf, COLWID, "%d", -1 - rSv(PRIORITY, s_int, pp));
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
ps: display the nice value for processes with the SCHED_BATCH scheduler policy Ps command does not display the nice value for processes with the SCHED_BATCH scheduler policy, only for SCHED_OTHER. Boinc (http://boinc.berkeley.edu/) client runs project processing jobs on Linux using SCHED_BATCH scheduler policy and nice value 19. The nice value is not displayable by ps. Steps to Reproduce: 1. Run process using SCHED_BATCH scheduler policy with nice value. ./test-schedbatch 18 & 2. Display process details: ps -o pid,ppid,user,comm,cls,nice Results before: [mike@rockover c]$ ps -o pid,ppid,user,comm,cls,nice PID PPID USER COMMAND CLS NI 18205 2540 mike bash TS 0 20552 18205 mike test-schedbatch B - 20553 18205 mike ps TS 0 [mike@rockover c]$ awk '{printf "%5d %-17s %1d %2d\n", $1, $2, $41, $19}' /proc/20552/stat 20552 (test-schedbatch) 3 18 Results after this patch: [mike@rockover c]$ ps -o pid,ppid,user,comm,cls,nice PID PPID USER COMMAND CLS NI 18205 2540 mike bash TS 0 20552 18205 mike test-schedbatch B 18 20553 18205 mike ps TS 0 Additional info: Here is the fragment from the sched_setscheduler(2) manual page on the subject: SCHED_BATCH: Scheduling batch processes (Since Linux 2.6.16.) SCHED_BATCH can only be used at static priority 0. This policy is similar to SCHED_OTHER in that it schedules the process according to its dynamic priority (based on the nice value). The difference is that this policy will cause the scheduler to always assume that the process is CPU-intensive. Consequently, the scheduler will apply a small scheduling penalty with respect to wakeup behaviour, so that this process is mildly disfavored in scheduling decisions. This policy is useful for workloads that are noninteractive, but do not want to lower their nice value, and for workloads that want a determin- istic scheduling policy without interactivity causing extra preemptions (between the workload's tasks). Reference: https://bugzilla.redhat.com/show_bug.cgi?id=741090 Acked-by: Jaromir Capik <jcapik@redhat.com> Acked-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Mike Fleetwood <mike.fleetwood@googlemail.com>
2011-09-25 14:47:06 +05:30
// Linux applies nice value in the scheduling policies (classes)
// SCHED_OTHER(0) and SCHED_BATCH(3). Ref: sched_setscheduler(2).
// Also print nice value for old kernels which didn't use scheduling
// policies (-1).
%cpu and other changes
2004-09-12 21:13:48 +05:30
static int pr_nice(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(NICE,SCHED_CLASS)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
if(rSv(SCHED_CLASS, s_int, pp)!=0 && rSv(SCHED_CLASS, s_int, pp)!=3 && rSv(SCHED_CLASS, s_int, pp)!=-1) return snprintf(outbuf, COLWID, "-");
return snprintf(outbuf, COLWID, "%d", rSv(NICE, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: Add OOM and OOMADJ fields top has had the OOMs and OOMa fields since 2011. Ten years its probably time that ps had these fields added too. ps output options have oom and oomadj for OOM Score and OOM Adjustment respectively. References: procps-ng/procps#198 commit 367fd902dab64b51ba49709004b5011440e3105a https://www.freelists.org/post/procps/PATCH-12-Add-missed-oom-support-to-libproc
2021-03-05 11:52:29 +05:30
static int pr_oom_adj(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(OOM_ADJ)
return snprintf(outbuf, COLWID, "%d", rSv(OOM_ADJ, s_int, pp));
}
static int pr_oom(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(OOM_SCORE)
return snprintf(outbuf, COLWID, "%d", rSv(OOM_SCORE, s_int, pp));
}
%cpu and other changes
2004-09-12 21:13:48 +05:30
// HP-UX "cls": RT RR RR2 ???? HPUX FIFO KERN
// Solaris "class": SYS TS FX IA RT FSS (FIFO is RR w/ Inf quant)
// FIFO+RR share RT; FIFO has Inf quant
// IA=interactive; FX=fixed; TS=timeshare; SYS=system
// FSS=fairshare; INTS=interrupts
// Tru64 "policy": FF RR TS
// IRIX "class": RT TS B BC WL GN
// RT=real-time; TS=time-share; B=batch; BC=batch-critical
// WL=weightless; GN=gang-scheduled
// see miser(1) for this; PRI has some letter codes too
static int pr_class(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SCHED_CLASS)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
switch(rSv(SCHED_CLASS, s_int, pp)){
%cpu and other changes
2004-09-12 21:13:48 +05:30
case -1: return snprintf(outbuf, COLWID, "-"); // not reported
Merged changes from procps-3.2.8 not present in CVS
2011-02-10 18:01:14 +05:30
case 0: return snprintf(outbuf, COLWID, "TS"); // SCHED_OTHER SCHED_NORMAL
%cpu and other changes
2004-09-12 21:13:48 +05:30
case 1: return snprintf(outbuf, COLWID, "FF"); // SCHED_FIFO
case 2: return snprintf(outbuf, COLWID, "RR"); // SCHED_RR
SCHED_* stuff up to #9
2007-05-06 00:12:16 +05:30
case 3: return snprintf(outbuf, COLWID, "B"); // SCHED_BATCH
Merged changes from procps-3.2.8 not present in CVS
2011-02-10 18:01:14 +05:30
case 4: return snprintf(outbuf, COLWID, "ISO"); // reserved for SCHED_ISO (Con Kolivas)
case 5: return snprintf(outbuf, COLWID, "IDL"); // SCHED_IDLE
ps: recognize SCHED_DEADLINE
2016-11-07 14:53:01 +05:30
case 6: return snprintf(outbuf, COLWID, "DLN"); // SCHED_DEADLINE
new /proc/meminfo fields
2008-03-24 10:11:26 +05:30
case 7: return snprintf(outbuf, COLWID, "#7"); //
%cpu and other changes
2004-09-12 21:13:48 +05:30
case 8: return snprintf(outbuf, COLWID, "#8"); //
new /proc/meminfo fields
2008-03-24 10:11:26 +05:30
case 9: return snprintf(outbuf, COLWID, "#9"); //
%cpu and other changes
2004-09-12 21:13:48 +05:30
default: return snprintf(outbuf, COLWID, "?"); // unknown value
}
}
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
%cpu and other changes
2004-09-12 21:13:48 +05:30
// Based on "type", FreeBSD would do:
// REALTIME "real:%u", prio
// NORMAL "normal"
// IDLE "idle:%u", prio
// default "%u:%u", type, prio
// We just print the priority, and have other keywords for type.
static int pr_rtprio(char *restrict const outbuf, const proc_t *restrict const pp){
misc: adapted programs impacted by header file changes Signed-off-by: Jim Warner <james.warner@comcast.net>
2019-03-13 10:30:00 +05:30
setREL2(SCHED_CLASS,PRIORITY_RT)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
if(rSv(SCHED_CLASS, s_int, pp)==0 || rSv(SCHED_CLASS, s_int, pp)==-1) return snprintf(outbuf, COLWID, "-");
misc: adapted programs impacted by header file changes Signed-off-by: Jim Warner <james.warner@comcast.net>
2019-03-13 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%d", rSv(PRIORITY_RT, s_int, pp));
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
%cpu and other changes
2004-09-12 21:13:48 +05:30
static int pr_sched(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SCHED_CLASS)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
if(rSv(SCHED_CLASS, s_int, pp)==-1) return snprintf(outbuf, COLWID, "-");
return snprintf(outbuf, COLWID, "%d", rSv(SCHED_CLASS, s_int, pp));
%cpu and other changes
2004-09-12 21:13:48 +05:30
}
////////////////////////////////////////////////////////////////////////////////
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_wchan(char *restrict const outbuf, const proc_t *restrict const pp){
procps 010114
2002-02-02 04:17:29 +05:30
/*
* Unix98 says "blank if running" and also "no blanks"! :-(
* Unix98 also says to use '-' if something is meaningless.
* Digital uses both '*' and '-', with undocumented differences.
* (the '*' for -1 (rare) and the '-' for 0)
* Sun claims to use a blank AND use '-', in the same man page.
* Perhaps "blank" should mean '-'.
*
* AIX uses '-' for running processes, the location when there is
* only one thread waiting in the kernel, and '*' when there is
* more than one thread waiting in the kernel.
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
*
* The output should be truncated to maximal columns width -- overflow
* is not supported for the "wchan".
procps 010114
2002-02-02 04:17:29 +05:30
*/
fix wchan alignment problem -- snprintf can return more than written
2005-01-11 02:59:53 +05:30
const char *w;
size_t len;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(WCHAN_NAME)
w = rSv(WCHAN_NAME, str, pp);
fix wchan alignment problem -- snprintf can return more than written
2005-01-11 02:59:53 +05:30
len = strlen(w);
if(len>max_rightward) len=max_rightward;
memcpy(outbuf, w, len);
outbuf[len] = '\0';
return len;
}
procps 010114
2002-02-02 04:17:29 +05:30
/* Terrible trunctuation, like BSD crap uses: I999 J999 K999 */
/* FIXME: disambiguate /dev/tty69 and /dev/pts/69. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_tty4(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(TTY_NUMBER)
return snprintf(outbuf, COLWID, "%s", rSv(TTY_NUMBER, str, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
/* Unix98: format is unspecified, but must match that used by who(1). */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_tty8(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(TTY_NAME)
return snprintf(outbuf, COLWID, "%s", rSv(TTY_NAME, str, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
#if 0
/* This BSD state display may contain spaces, which is illegal. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_oldstate(char *restrict const outbuf, const proc_t *restrict const pp){
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%s", status(pp));
}
#endif
lots of stuff, sorry
2004-08-10 08:44:10 +05:30
// This state display is Unix98 compliant and has lots of info like BSD.
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_stat(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
int end;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if (!outbuf) {
chkREL(STATE)
chkREL(NICE)
misc: adapt others to changes in interface, <PIDS> api I've got nothing to add to the commit message but that doesn't mean I won't produce perfectly justified text. Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-05-14 10:30:00 +05:30
chkREL(VM_RSS_LOCKED)
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
chkREL(ID_SESSION)
chkREL(ID_TGID)
chkREL(NLWP)
chkREL(ID_PGRP)
chkREL(ID_TPGID)
return 0;
}
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
end = 0;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
outbuf[end++] = rSv(STATE, s_ch, pp);
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
// if(rSv(RSS, ul_int, pp)==0 && rSv(STATE, s_ch, pp)!='Z') outbuf[end++] = 'W'; // useless "swapped out"
if(rSv(NICE, s_int, pp) < 0) outbuf[end++] = '<';
if(rSv(NICE, s_int, pp) > 0) outbuf[end++] = 'N';
lots of stuff, sorry
2004-08-10 08:44:10 +05:30
// In this order, NetBSD would add:
// traced 'X'
// systrace 'x'
// exiting 'E' (not printed for zombies)
// vforked 'V'
// system 'K' (and do not print 'L' too)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
if(rSv(VM_RSS_LOCKED, ul_int, pp)) outbuf[end++] = 'L';
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(rSv(ID_SESSION, s_int, pp) == rSv(ID_TGID, s_int, pp)) outbuf[end++] = 's'; // session leader
if(rSv(NLWP, s_int, pp) > 1) outbuf[end++] = 'l'; // multi-threaded
if(rSv(ID_PGRP, s_int, pp) == rSv(ID_TPGID, s_int, pp)) outbuf[end++] = '+'; // in foreground process group
procps 010114
2002-02-02 04:17:29 +05:30
outbuf[end] = '\0';
return end;
}
/* This minimal state display is Unix98 compliant, like SCO and SunOS 5 */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_s(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(STATE)
outbuf[0] = rSv(STATE, s_ch, pp);
procps 010114
2002-02-02 04:17:29 +05:30
outbuf[1] = '\0';
return 1;
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_flag(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(FLAGS)
shrink F to one column
2002-05-28 09:59:12 +05:30
/* Unix98 requires octal flags */
/* this user-hostile and volatile junk gets 1 character */
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%o", (unsigned)(rSv(FLAGS, ul_int, pp)>>6U)&0x7U);
procps 010114
2002-02-02 04:17:29 +05:30
}
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
// plus these: euid,ruid,egroup,rgroup (elsewhere in this file)
procps 010114
2002-02-02 04:17:29 +05:30
/*********** non-standard ***********/
/*** BSD
sess session pointer
(SCO has:Process session leader ID as a decimal value. (SESSION))
jobc job control count
cpu short-term cpu usage factor (for scheduling)
sl sleep time (in seconds; 127 = infinity)
re core residency time (in seconds; 127 = infinity)
pagein pageins (same as majflt)
lim soft memory limit
tsiz text size (in Kbytes)
***/
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_stackp(char *restrict const outbuf, const proc_t *restrict const pp){
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
setREL1(ADDR_STACK_START)
return snprintf(outbuf, COLWID, "%0*lx", (int)(2*sizeof(long)), rSv(ADDR_STACK_START, ul_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_esp(char *restrict const outbuf, const proc_t *restrict const pp){
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
setREL1(ADDR_CURR_ESP)
return snprintf(outbuf, COLWID, "%0*lx", (int)(2*sizeof(long)), rSv(ADDR_CURR_ESP, ul_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_eip(char *restrict const outbuf, const proc_t *restrict const pp){
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
setREL1(ADDR_CURR_EIP)
return snprintf(outbuf, COLWID, "%0*lx", (int)(2*sizeof(long)), rSv(ADDR_CURR_EIP, ul_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_bsdtime(char *restrict const outbuf, const proc_t *restrict const pp){
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
unsigned long long t;
unsigned u;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(TICS_ALL,TICS_ALL_C)
if(include_dead_children) t = rSv(TICS_ALL_C, ull_int, pp);
else t = rSv(TICS_ALL, ull_int, pp);
64-bit time for Linux 2.5.xx
2002-05-28 09:48:55 +05:30
u = t / Hertz;
return snprintf(outbuf, COLWID, "%3u:%02u", u/60U, u%60U);
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_bsdstart(char *restrict const outbuf, const proc_t *restrict const pp){
procps 010114
2002-02-02 04:17:29 +05:30
time_t start;
time_t seconds_ago;
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
setREL1(TICS_BEGAN)
start = boot_time() + rSv(TICS_BEGAN, ull_int, pp) / Hertz;
procps 010114
2002-02-02 04:17:29 +05:30
seconds_ago = seconds_since_1970 - start;
if(seconds_ago < 0) seconds_ago=0;
0060-ps/output.c: Protect outbuf in various pr_*() functions. pr_bsdstart(): Replace "strcpy(outbuf," with "snprintf(outbuf, COLWID," (which is used in all surrounding functions). (side note: the fact that many pr_*() functions simply return "snprintf(outbuf, COLWID," justifies the "amount" checks added to show_one_proc() by the "ps/output.c: Replace strcpy() with snprintf() in show_one_proc()." patch) pr_stime(): Check the return value of strftime() (in case of an error, "the contents of the array are undefined"). help_pr_sig(): Handle the "len < 8" case, otherwise "sig+len-8" may point outside the sig string. pr_context(): Handle the empty string case, or else "outbuf[len-1]" points outside outbuf. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if(seconds_ago > 3600*24) snprintf(outbuf, COLWID, "%s", ctime(&start)+4);
else snprintf(outbuf, COLWID, "%s", ctime(&start)+10);
procps 010114
2002-02-02 04:17:29 +05:30
outbuf[6] = '\0';
return 6;
}
/* HP-UX puts this in pages and uses "vsz" for kB */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sz(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(VM_SIZE)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", rSv(VM_SIZE, ul_int, pp)/(page_size/1024));
procps 010114
2002-02-02 04:17:29 +05:30
}
/*
* FIXME: trs,drs,tsiz,dsiz,m_trs,m_drs,vm_exe,vm_data,trss
* I suspect some/all of those are broken. They seem to have been
* inherited by Linux and AIX from early BSD systems. FreeBSD only
* retains tsiz. The prefixed versions come from Debian.
* Sun and Digital have none of this crap. The code here comes
* from an old Linux ps, and might not be correct for ELF executables.
*
* AIX TRS size of resident-set (real memory) of text
* AIX TSIZ size of text (shared-program) image
* FreeBSD tsiz text size (in Kbytes)
* 4.3BSD NET/2 trss text resident set size (in Kbytes)
* 4.3BSD NET/2 tsiz text size (in Kbytes)
*/
/* kB data size. See drs, tsiz & trs. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_dsiz(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
long dsiz;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
setREL3(VSIZE_BYTES,ADDR_CODE_END,ADDR_CODE_START)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
dsiz = 0;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
if(rSv(VSIZE_BYTES, ul_int, pp)) dsiz += (rSv(VSIZE_BYTES, ul_int, pp) - rSv(ADDR_CODE_END, ul_int, pp) + rSv(ADDR_CODE_START, ul_int, pp)) >> 10;
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%ld", dsiz);
}
/* kB text (code) size. See trs, dsiz & drs. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_tsiz(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
long tsiz;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
setREL3(VSIZE_BYTES,ADDR_CODE_END,ADDR_CODE_START)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
tsiz = 0;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
if(rSv(VSIZE_BYTES, ul_int, pp)) tsiz += (rSv(ADDR_CODE_END, ul_int, pp) - rSv(ADDR_CODE_START, ul_int, pp)) >> 10;
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%ld", tsiz);
}
/* kB _resident_ data size. See dsiz, tsiz & trs. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_drs(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
long drs;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
setREL3(VSIZE_BYTES,ADDR_CODE_END,ADDR_CODE_START)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
drs = 0;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
if(rSv(VSIZE_BYTES, ul_int, pp)) drs += (rSv(VSIZE_BYTES, ul_int, pp) - rSv(ADDR_CODE_END, ul_int, pp) + rSv(ADDR_CODE_START, ul_int, pp)) >> 10;
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%ld", drs);
}
/* kB text _resident_ (code) size. See tsiz, dsiz & drs. */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_trs(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
long trs;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
setREL3(VSIZE_BYTES,ADDR_CODE_END,ADDR_CODE_START)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
trs = 0;
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
if(rSv(VSIZE_BYTES, ul_int, pp)) trs += (rSv(ADDR_CODE_END, ul_int, pp) - rSv(ADDR_CODE_START, ul_int, pp)) >> 10;
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%ld", trs);
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_swapable(char *restrict const outbuf, const proc_t *restrict const pp){
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
setREL3(VM_DATA,VM_STACK,VSIZE_BYTES) // that last enum will approximate sort needs
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", rSv(VM_DATA, ul_int, pp) + rSv(VM_STACK, ul_int, pp));
"size" means kB of swappable address space
2002-10-03 12:16:01 +05:30
}
procps 010114
2002-02-02 04:17:29 +05:30
all 2.5.xx RT info except HP-UX "cls"
2002-10-03 15:11:57 +05:30
/* nasty old Debian thing */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_size(char *restrict const outbuf, const proc_t *restrict const pp){
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
setREL1(VSIZE_BYTES)
return snprintf(outbuf, COLWID, "%lu", rSv(VSIZE_BYTES, ul_int, pp));
all 2.5.xx RT info except HP-UX "cls"
2002-10-03 15:11:57 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_minflt(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(FLT_MIN,FLT_MIN_C)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
unsigned long flt = rSv(FLT_MIN, ul_int, pp);
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(include_dead_children) flt = rSv(FLT_MIN_C, ul_int, pp);
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", flt);
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_majflt(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(FLT_MAJ,FLT_MAJ_C)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
unsigned long flt = rSv(FLT_MAJ, ul_int, pp);
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
if(include_dead_children) flt = rSv(FLT_MAJ_C, ul_int, pp);
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", flt);
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_lim(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(RSS_RLIM)
if(rSv(RSS_RLIM, ul_int, pp) == RLIM_INFINITY){
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
outbuf[0] = 'x';
outbuf[1] = 'x';
outbuf[2] = '\0';
return 2;
}
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%5lu", rSv(RSS_RLIM, ul_int, pp) >> 10L);
procps 010114
2002-02-02 04:17:29 +05:30
}
/* should print leading tilde ('~') if process is bound to the CPU */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_psr(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(PROCESSOR)
ps,top: convert 'PIDS_PROCESSOR' into a signed integer Not only does that library tweak help to simplify some top code, but now that ps snprintf fmtstr will finally be accurate. That is two birdies with a single pebble! Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-12-14 11:30:00 +05:30
return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: Add PSS and USS fields The library added smaps_rollup fields in the referenced commit. This commit exploits the new fields to give pss and uss options. These options were first proposed back in 2015 by Petr Malat and, with the library update, they are finally made it into ps. Why use proportional or unique segment size? It is argued that these give a better idea of the "real" memory usage of a process. References: commit 12543b6c7690c379abc28e278cd804c05490a8b1 issue #112 https://www.freelists.org/post/procps/PSS-and-USS-support-for-ps https://lwn.net/Articles/230975/ Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-06-16 16:43:52 +05:30
static int pr_pss(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(SMAP_PSS)
return snprintf(outbuf, COLWID, "%lu", rSv(SMAP_PSS, ul_int, pp));
}
ps: have now added the NUMA node field display support Reference(s): https://gitlab.com/procps-ng/procps/issues/58 Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-05-12 10:35:00 +05:30
static int pr_numa(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(PROCESSOR_NODE)
return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR_NODE, s_int, pp));
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_rss(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(VM_RSS)
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
return snprintf(outbuf, COLWID, "%lu", rSv(VM_RSS, ul_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
/* pp->vm_rss * 1000 would overflow on 32-bit systems with 64 GB memory */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_pmem(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
unsigned long pmem;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(VM_RSS)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
pmem = 0;
First cut at subset=pid proc mount handling The procfs mount option subset=pid only shows the processes, not things such as /proc/stat etc. For certain programs, this should mean they still work, but have reduced functionality. This is the first cut at some of them. pgrep - Removed always loading uptime which we never used anyway. The program now works fine unless we use --older. Add note in man page stating it will silently fail. ps - Load boot time and memory total only when required instead of always. Changed the error messages to something the user actually cares about "can't get system boot time" vs "create a structure". Works for most fields except starts and percent memory. uptime - Give more useful error messages if uptime not available. vmstat - move header generation after testing for required proc files, makes the default output more consistent with the rest of the options. References: procps-ng/procps#227 https://www.kernel.org/doc/html/latest/filesystems/proc.html#chapter-4-configuring-procfs https://github.com/torvalds/linux/commit/6814ef2d992af09451bbeda4770daa204461329e Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-12-16 15:06:00 +05:30
pmem = rSv(VM_RSS, ul_int, pp) * 1000ULL / memory_total();
procps 010114
2002-02-02 04:17:29 +05:30
if (pmem > 999) pmem = 999;
return snprintf(outbuf, COLWID, "%2u.%u", (unsigned)(pmem/10), (unsigned)(pmem%10));
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_lstart(char *restrict const outbuf, const proc_t *restrict const pp){
procps 010114
2002-02-02 04:17:29 +05:30
time_t t;
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
setREL1(TICS_BEGAN)
t = boot_time() + rSv(TICS_BEGAN, ull_int, pp) / Hertz;
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%24.24s", ctime(&t));
}
/* Unix98 specifies a STIME header for a column that shows the start
* time of the process, but does not specify a format or format specifier.
* From the general Unix98 rules, we know there must not be any spaces.
* Most systems violate that rule, though the Solaris documentation
* claims to print the column without spaces. (NOT!)
*
* So this isn't broken, but could be renamed to u98_std_stime,
* as long as it still shows as STIME when using the -f option.
*/
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_stime(char *restrict const outbuf, const proc_t *restrict const pp){
ps: Make STIME entries thread safe Using localtime() can be a problem due to the static buffer for the return value. It's simple enough to use localtime_r() Signed-off-by: Craig Small <csmall@dropbear.xyz>
2022-06-30 16:45:37 +05:30
struct tm proc_time;
struct tm our_time;
procps 010114
2002-02-02 04:17:29 +05:30
time_t t;
gcc 3.0 warnings
2002-10-12 09:55:57 +05:30
const char *fmt;
procps 010114
2002-02-02 04:17:29 +05:30
int tm_year;
int tm_yday;
0060-ps/output.c: Protect outbuf in various pr_*() functions. pr_bsdstart(): Replace "strcpy(outbuf," with "snprintf(outbuf, COLWID," (which is used in all surrounding functions). (side note: the fact that many pr_*() functions simply return "snprintf(outbuf, COLWID," justifies the "amount" checks added to show_one_proc() by the "ps/output.c: Replace strcpy() with snprintf() in show_one_proc()." patch) pr_stime(): Check the return value of strftime() (in case of an error, "the contents of the array are undefined"). help_pr_sig(): Handle the "len < 8" case, otherwise "sig+len-8" may point outside the sig string. pr_context(): Handle the empty string case, or else "outbuf[len-1]" points outside outbuf. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
size_t len;
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
setREL1(TICS_BEGAN)
ps: Make STIME entries thread safe Using localtime() can be a problem due to the static buffer for the return value. It's simple enough to use localtime_r() Signed-off-by: Craig Small <csmall@dropbear.xyz>
2022-06-30 16:45:37 +05:30
if (localtime_r(&seconds_since_1970, &our_time) == NULL)
return 0;
tm_year = our_time.tm_year;
tm_yday = our_time.tm_yday;
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
t = boot_time() + rSv(TICS_BEGAN, ull_int, pp) / Hertz;
ps: Make STIME entries thread safe Using localtime() can be a problem due to the static buffer for the return value. It's simple enough to use localtime_r() Signed-off-by: Craig Small <csmall@dropbear.xyz>
2022-06-30 16:45:37 +05:30
if (localtime_r(&t, &proc_time) == NULL)
return 0;
procps 010114
2002-02-02 04:17:29 +05:30
fmt = "%H:%M"; /* 03:02 23:59 */
ps: Make STIME entries thread safe Using localtime() can be a problem due to the static buffer for the return value. It's simple enough to use localtime_r() Signed-off-by: Craig Small <csmall@dropbear.xyz>
2022-06-30 16:45:37 +05:30
if(tm_yday != proc_time.tm_yday) fmt = "%b%d"; /* Jun06 Aug27 */
if(tm_year != proc_time.tm_year) fmt = "%Y"; /* 1991 2001 */
len = strftime(outbuf, COLWID, fmt, &proc_time);
0060-ps/output.c: Protect outbuf in various pr_*() functions. pr_bsdstart(): Replace "strcpy(outbuf," with "snprintf(outbuf, COLWID," (which is used in all surrounding functions). (side note: the fact that many pr_*() functions simply return "snprintf(outbuf, COLWID," justifies the "amount" checks added to show_one_proc() by the "ps/output.c: Replace strcpy() with snprintf() in show_one_proc()." patch) pr_stime(): Check the return value of strftime() (in case of an error, "the contents of the array are undefined"). help_pr_sig(): Handle the "len < 8" case, otherwise "sig+len-8" may point outside the sig string. pr_context(): Handle the empty string case, or else "outbuf[len-1]" points outside outbuf. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if(len <= 0 || len >= COLWID) outbuf[len = 0] = '\0';
return len;
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_start(char *restrict const outbuf, const proc_t *restrict const pp){
procps 010114
2002-02-02 04:17:29 +05:30
time_t t;
char *str;
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
setREL1(TICS_BEGAN)
t = boot_time() + rSv(TICS_BEGAN, ull_int, pp) / Hertz;
procps 010114
2002-02-02 04:17:29 +05:30
str = ctime(&t);
if(str[8]==' ') str[8]='0';
if(str[11]==' ') str[11]='0';
added ps etimes, miscellaneous top enhancements ps program . etimes added for ELAPSED expressed in seconds . time_t used in place of former unsigned long top program . corrected scroll message bug when 'x' toggle on . fixed forest view potential missing libflags bug . improved 'k' default signal invocation logic . enhanced logic for %CPU maximums displayed . made signal handling more robust and efficient
2011-09-12 17:48:23 +05:30
if((unsigned long)t+60*60*24 > (unsigned long)seconds_since_1970)
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%8.8s", str+11);
return snprintf(outbuf, COLWID, " %6.6s", str+4);
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int help_pr_sig(char *restrict const outbuf, const char *restrict const sig){
0060-ps/output.c: Protect outbuf in various pr_*() functions. pr_bsdstart(): Replace "strcpy(outbuf," with "snprintf(outbuf, COLWID," (which is used in all surrounding functions). (side note: the fact that many pr_*() functions simply return "snprintf(outbuf, COLWID," justifies the "amount" checks added to show_one_proc() by the "ps/output.c: Replace strcpy() with snprintf() in show_one_proc()." patch) pr_stime(): Check the return value of strftime() (in case of an error, "the contents of the array are undefined"). help_pr_sig(): Handle the "len < 8" case, otherwise "sig+len-8" may point outside the sig string. pr_context(): Handle the empty string case, or else "outbuf[len-1]" points outside outbuf. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
const size_t len = strlen(sig);
procps 010114
2002-02-02 04:17:29 +05:30
if(wide_signals){
if(len>8) return snprintf(outbuf, COLWID, "%s", sig);
return snprintf(outbuf, COLWID, "00000000%s", sig);
}
if(len-strspn(sig,"0") > 8)
return snprintf(outbuf, COLWID, "<%s", sig+len-8);
0060-ps/output.c: Protect outbuf in various pr_*() functions. pr_bsdstart(): Replace "strcpy(outbuf," with "snprintf(outbuf, COLWID," (which is used in all surrounding functions). (side note: the fact that many pr_*() functions simply return "snprintf(outbuf, COLWID," justifies the "amount" checks added to show_one_proc() by the "ps/output.c: Replace strcpy() with snprintf() in show_one_proc()." patch) pr_stime(): Check the return value of strftime() (in case of an error, "the contents of the array are undefined"). help_pr_sig(): Handle the "len < 8" case, otherwise "sig+len-8" may point outside the sig string. pr_context(): Handle the empty string case, or else "outbuf[len-1]" points outside outbuf. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if(len < 8)
return snprintf(outbuf, COLWID, "%s%s", "00000000"+len, sig);
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "%s", sig+len-8);
}
new /proc/meminfo fields
2008-03-24 10:11:26 +05:30
// This one is always thread-specific pending. (from Dragonfly BSD)
static int pr_tsig(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SIGPENDING)
return help_pr_sig(outbuf, rSv(SIGPENDING, str, pp));
new /proc/meminfo fields
2008-03-24 10:11:26 +05:30
}
// This one is (wrongly?) thread-specific when printing thread lines,
// but process-pending otherwise.
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sig(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SIGNALS)
return help_pr_sig(outbuf, rSv(SIGNALS, str, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sigmask(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SIGBLOCKED)
return help_pr_sig(outbuf, rSv(SIGBLOCKED, str, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sigignore(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SIGIGNORE)
return help_pr_sig(outbuf, rSv(SIGIGNORE, str, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sigcatch(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SIGCATCH)
return help_pr_sig(outbuf, rSv(SIGCATCH, str, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: Add PSS and USS fields The library added smaps_rollup fields in the referenced commit. This commit exploits the new fields to give pss and uss options. These options were first proposed back in 2015 by Petr Malat and, with the library update, they are finally made it into ps. Why use proportional or unique segment size? It is argued that these give a better idea of the "real" memory usage of a process. References: commit 12543b6c7690c379abc28e278cd804c05490a8b1 issue #112 https://www.freelists.org/post/procps/PSS-and-USS-support-for-ps https://lwn.net/Articles/230975/ Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-06-16 16:43:52 +05:30
static int pr_uss(char *restrict const outbuf, const proc_t *restrict const pp){
ps: adapt to the newly added library smaps_rollup item In that commit referenced below, a new field was added to the ps program which required adding 2 newlib items together. Such a need is now satisfied by the library. So, this commit will just adapt ps for that provision. Reference(s): commit e782b1d85989a9d27474264d4d65ffe1c485bdc9 Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-06-16 10:30:00 +05:30
setREL1(SMAP_PRV_TOTAL)
return snprintf(outbuf, COLWID, "%lu", rSv(SMAP_PRV_TOTAL, ul_int, pp));
ps: Add PSS and USS fields The library added smaps_rollup fields in the referenced commit. This commit exploits the new fields to give pss and uss options. These options were first proposed back in 2015 by Petr Malat and, with the library update, they are finally made it into ps. Why use proportional or unique segment size? It is argued that these give a better idea of the "real" memory usage of a process. References: commit 12543b6c7690c379abc28e278cd804c05490a8b1 issue #112 https://www.freelists.org/post/procps/PSS-and-USS-support-for-ps https://lwn.net/Articles/230975/ Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-06-16 16:43:52 +05:30
}
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
////////////////////////////////////////////////////////////////////////////////
/*
* internal terms: ruid euid suid fuid
* kernel vars: uid euid suid fsuid
* command args: ruid uid svuid n/a
*/
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_egid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_EGID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_EGID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_rgid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_RGID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_RGID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sgid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_SGID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_SGID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_fgid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_FGID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_FGID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
static int pr_euid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_EUID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_EUID, u_int, pp));
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_ruid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_RUID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_RUID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_suid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_SUID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_SUID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_fuid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_FUID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_FUID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
ps: changed to exploit a newly added UID used at login This patch represents a newlib adaptation of the merge request offered by Jan Rybar that is referenced below. Reference(s): https://gitlab.com/procps-ng/procps/merge_requests/57 https://bugzilla.redhat.com/show_bug.cgi?id=1518986 Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-02-11 13:52:22 +05:30
static int pr_luid(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(ID_LOGIN)
if(rSv(ID_LOGIN, s_int, pp)==-1) return snprintf(outbuf, COLWID, "-");
return snprintf(outbuf, COLWID, "%d", rSv(ID_LOGIN, s_int, pp));
}
procps 010114
2002-02-02 04:17:29 +05:30
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
// The Open Group Base Specifications Issue 6 (IEEE Std 1003.1, 2004 Edition)
// requires that user and group names print as decimal numbers if there is
ps: favor truncation of long names over POSIX/UNIX standard The UNIX and POSIX standards require that user and group names be printed as decimal integers when there is insufficient room. This has led to a constant stream of bug reports. With this commit, long names will be truncated and displayed with a trailing visual clue. To avoid truncation. the UNIX and POSIX way to change column width is to rename the column: ps -o pid,user=CumbersomeUserNames -o comm The easy way is to directly specify the desired width: ps -o pid,user:19,comm Reference: http://www.freelists.org/post/procps/rhbz737215-ps-does-not-resolve-some-user-names Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-09-18 02:00:45 +05:30
// not enough room in the column. However, we will now truncate such names
// and provide a visual hint of such truncation. Hopefully, this will reduce
// the volume of bug reports regarding that former 'feature'.
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
//
// The UNIX and POSIX way to change column width is to rename it:
// ps -o pid,user=CumbersomeUserNames -o comm
// The easy way is to directly specify the desired width:
// ps -o pid,user:19,comm
//
static int do_pr_name(char *restrict const outbuf, const char *restrict const name, unsigned u){
if(!user_is_number){
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
int rightward = OUTBUF_SIZE; /* max cells */
int len; /* real cells */
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
escape_str(outbuf, name, OUTBUF_SIZE, &rightward);
len = OUTBUF_SIZE-rightward;
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
if(len <= (int)max_rightward)
return len; /* returns number of cells */
ps: favor truncation of long names over POSIX/UNIX standard The UNIX and POSIX standards require that user and group names be printed as decimal integers when there is insufficient room. This has led to a constant stream of bug reports. With this commit, long names will be truncated and displayed with a trailing visual clue. To avoid truncation. the UNIX and POSIX way to change column width is to rename the column: ps -o pid,user=CumbersomeUserNames -o comm The easy way is to directly specify the desired width: ps -o pid,user:19,comm Reference: http://www.freelists.org/post/procps/rhbz737215-ps-does-not-resolve-some-user-names Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-09-18 02:00:45 +05:30
ps: don't use '+' truncation indicator with multi-byte The ps program generally supports multi-byte sequences in strings representing user and group names. However, should a multi-byte sequence span the maximum width of a column, the '+' inserted by ps to signify truncation will corrupt that sequence, misaligning the text line. Unfortunately, there's insufficient info returned from the escape_str function (who calls escape_str_utf8) to provide a robust response. So, this commit will revert to the old standby of displaying a number when the '+' character would've corrupted that multi-byte sequence. Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-10-01 22:29:59 +05:30
// only use '+' when not on a multi-byte char, else show uid
0059-ps/output.c: Enforce a safe range for max_rightward. Enforce a maximum max_rightward of OUTBUF_SIZE-1, because it is used in constructs such as "snprintf(outbuf, max_rightward+1," (we could remove the extra check at the beginning of forest_helper() now, but we decided to leave it, as a precaution and reminder). The minimum max_rightward check is not strictly needed, because it is unsigned. However, we decided to add it anyway: - most of the other variables are signed; - make it visually clear that this case is properly handled; - ideally, the minimum max_rightward should be 1, not 0 (to prevent integer overflows such as "max_rightward-1"), but this might change the behavior/output of ps, so we decided against it, for now. Instead, we fixed the only function that overflows if max_rightward is 0. Also, enforce the same safe range for max_leftward, although it is never used throughout the code-base. ---------------------------- adapted for newlib branch . adapted via 'patch' without rejections Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if (max_rightward >= 1 && (unsigned)outbuf[max_rightward-1] < 127) {
ps: don't use '+' truncation indicator with multi-byte The ps program generally supports multi-byte sequences in strings representing user and group names. However, should a multi-byte sequence span the maximum width of a column, the '+' inserted by ps to signify truncation will corrupt that sequence, misaligning the text line. Unfortunately, there's insufficient info returned from the escape_str function (who calls escape_str_utf8) to provide a robust response. So, this commit will revert to the old standby of displaying a number when the '+' character would've corrupted that multi-byte sequence. Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-10-01 22:29:59 +05:30
len = max_rightward-1;
outbuf[len++] = '+';
outbuf[len] = 0;
return len;
}
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
}
return snprintf(outbuf, COLWID, "%u", u);
}
procps 010114
2002-02-02 04:17:29 +05:30
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
static int pr_ruser(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_RUSER,ID_RUID)
return do_pr_name(outbuf, rSv(ID_RUSER, str, pp), rSv(ID_RUID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
static int pr_euser(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_EUSER,ID_EUID)
return do_pr_name(outbuf, rSv(ID_EUSER, str, pp), rSv(ID_EUID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_fuser(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_FUSER,ID_FUID)
return do_pr_name(outbuf, rSv(ID_FUSER, str, pp), rSv(ID_FUID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_suser(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_SUSER,ID_SUID)
return do_pr_name(outbuf, rSv(ID_SUSER, str, pp), rSv(ID_SUID, u_int, pp));
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
}
static int pr_egroup(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_EGROUP,ID_EGID)
return do_pr_name(outbuf, rSv(ID_EGROUP, str, pp), rSv(ID_EGID, u_int, pp));
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
}
static int pr_rgroup(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_RGROUP,ID_RGID)
return do_pr_name(outbuf, rSv(ID_RGROUP, str, pp), rSv(ID_RGID, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
static int pr_fgroup(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_FGROUP,ID_FGID)
return do_pr_name(outbuf, rSv(ID_FGROUP, str, pp), rSv(ID_FGID, u_int, pp));
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
}
static int pr_sgroup(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(ID_SGROUP,ID_SGID)
return do_pr_name(outbuf, rSv(ID_SGROUP, str, pp), rSv(ID_SGID, u_int, pp));
avoid truncating long usernames
2004-07-21 06:07:38 +05:30
}
//////////////////////////////////////////////////////////////////////////////////
procps 010114
2002-02-02 04:17:29 +05:30
ps: Add IO Accounting fields Add the fields for the IO accounting to ps as the library now has them added from previous commit. References: commit a7afe06e6f1b397b7404fbee724a51f88cc8a59c
2021-04-24 18:43:38 +05:30
// IO stats
static int pr_rbytes(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_READ_BYTES)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_READ_BYTES, ul_int, pp));
}
static int pr_rchars(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_READ_CHARS)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_READ_CHARS, ul_int, pp));
}
static int pr_rops(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_READ_OPS)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_READ_OPS, ul_int, pp));
}
static int pr_wbytes(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_WRITE_BYTES)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_WRITE_BYTES, ul_int, pp));
}
static int pr_wcbytes(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_WRITE_CBYTES)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_WRITE_CBYTES, ul_int, pp));
}
static int pr_wchars(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_WRITE_CHARS)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_WRITE_CHARS, ul_int, pp));
}
static int pr_wops(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(IO_WRITE_OPS)
return snprintf(outbuf, COLWID, "%lu", rSv(IO_WRITE_OPS, ul_int, pp));
}
//////////////////////////////////////////////////////////////////////////////////
added tgid support plus miscellaneous cleanup ps . added tgid support . made process/task naming consistent top . added tgid support . standardized pid related width logic documents . added tgid to ps & top man documents library . fixed OOMEM_ENABLE readtask bug . corrected header typo for tgid
2011-08-17 16:31:35 +05:30
// PID pid, TGID tgid
static int pr_procs(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_TGID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_TGID, s_int, pp));
added tgid support plus miscellaneous cleanup ps . added tgid support . made process/task naming consistent top . added tgid support . standardized pid related width logic documents . added tgid to ps & top man documents library . fixed OOMEM_ENABLE readtask bug . corrected header typo for tgid
2011-08-17 16:31:35 +05:30
}
// LWP lwp, SPID spid, TID tid
static int pr_tasks(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_PID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_PID, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
more goodies
2003-10-16 09:00:41 +05:30
// thcount THCNT
static int pr_nlwp(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(NLWP)
return snprintf(outbuf, COLWID, "%d", rSv(NLWP, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sess(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_SESSION)
return snprintf(outbuf, COLWID, "%d", rSv(ID_SESSION, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
static int pr_supgid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
int rightward;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SUPGIDS)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
rightward = max_rightward;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
escaped_copy(outbuf, rSv(SUPGIDS, str, pp), OUTBUF_SIZE, &rightward);
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
return max_rightward-rightward;
}
static int pr_supgrp(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
int rightward;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SUPGROUPS)
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
rightward = max_rightward;
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
escape_str(outbuf, rSv(SUPGROUPS, str, pp), OUTBUF_SIZE, &rightward);
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
return max_rightward-rightward;
}
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_tpgid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_TPGID)
return snprintf(outbuf, COLWID, "%d", rSv(ID_TPGID, s_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
}
/* SGI uses "cpu" to print the processor ID with header "P" */
c99 for ps
2002-11-27 15:22:19 +05:30
static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp){ /* FIXME */
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL2(STATE,PROCESSOR)
if(rSv(STATE, s_ch, pp) == 'R') return snprintf(outbuf, COLWID, "%u", rSv(PROCESSOR, u_int, pp));
procps 010114
2002-02-02 04:17:29 +05:30
return snprintf(outbuf, COLWID, "*");
}
ps: exploited that newly added field 'executable path' Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-22 10:30:00 +05:30
/* full path to executable */
static int pr_exe(char *restrict const outbuf, const proc_t *restrict const pp){
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
int rightward;
ps: exploited that newly added field 'executable path' Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-22 10:30:00 +05:30
setREL1(EXE)
ps: extend utf8 multibyte support to additional fields Form its inception (back in May of 2011), escaped_copy has always been a flawed function. It does not operate on 'escaped' strings but instead treats all input as a regular string incapable of containing utf8 sequences. As such, it should only be used for strings guaranteed to NOT embody multibyte characters (like SUPGIDS). For all other strings, which could contain utf8 stuff, the correct function should have been that escape_str guy. So this commit changes nearly every escaped_copy call. Reference(s): . May 2011, original escaped_copy (cmdline, cgroup) commit 7b0fc19e9d28380dc9790615b93bc3653d6d686e Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-12-23 11:30:00 +05:30
rightward = max_rightward;
escape_str(outbuf, rSv(EXE, str, pp), OUTBUF_SIZE, &rightward);
return max_rightward-rightward;
ps: exploited that newly added field 'executable path' Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-22 10:30:00 +05:30
}
ps: plus for symmetry 'UTILIZATION_C' is newest format This commit just compliments a change referenced below by providing the value which includes reaped children. [ as an aside, it looks like ps only includes reaped ] [ children values under an obscure BSD or GNU option ] [ so, this change is possibly of even more relevance ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
/* %cpu utilization over task lifetime, as ##.### format */
ps: exploit the library addition for 'cpu utilization' This just parallels the top program by adding that new library PIDS_UTILIZATION item to the ps repertoire. It should be noted, however, that the new %CUU field is a little redundant. I mean, ps already has 4 such fields implemented identified as: '%cpu', 'c', 'cp' & 'pcpu'. Oh well, at least the newest one offers a little value added in the form of extra precision. We'll follow the top lead and display results in the form of: '##.###'. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-04 11:30:00 +05:30
static int pr_utilization(char *restrict const outbuf, const proc_t *restrict const pp){
double cu;
setREL1(UTILIZATION)
cu = rSv(UTILIZATION, real, pp);
/* this check is really just for us (the ps program) since we will be very
short lived and the library might reflect 100% or even more utilization */
if (cu > 99.0) cu = 99.999;
return snprintf(outbuf, COLWID, "%#.3f", cu);
}
ps: plus for symmetry 'UTILIZATION_C' is newest format This commit just compliments a change referenced below by providing the value which includes reaped children. [ as an aside, it looks like ps only includes reaped ] [ children values under an obscure BSD or GNU option ] [ so, this change is possibly of even more relevance ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
/* %cpu utilization (plus dead children) over task lifetime, as ##.### format */
static int pr_utilization_c(char *restrict const outbuf, const proc_t *restrict const pp){
double cu;
setREL1(UTILIZATION_C)
cu = rSv(UTILIZATION_C, real, pp);
/* this check is really just for us (the ps program) since we will be very
short lived and the library might reflect 100% or even more utilization */
if (cu > 99.0) cu = 99.999;
return snprintf(outbuf, COLWID, "%#.3f", cu);
}
ps: possibility to display systemd unit for a process Library systemd-login offers possibility to display name of a systemd unit file for specific pid. Note that not all processes are part of a system unit/service (e.g. user processes, or kernel threads). This patch adds output option "sd_unit" which will show name of systemd unit or "-", when process does not belong to any unit. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-16 18:12:30 +05:30
/************************* Systemd stuff ********************************/
static int pr_sd_unit(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_UNIT)
return snprintf(outbuf, COLWID, "%s", rSv(SD_UNIT, str, pp));
ps: possibility to display systemd unit for a process Library systemd-login offers possibility to display name of a systemd unit file for specific pid. Note that not all processes are part of a system unit/service (e.g. user processes, or kernel threads). This patch adds output option "sd_unit" which will show name of systemd unit or "-", when process does not belong to any unit. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-16 18:12:30 +05:30
}
ps: possibility to display login session for a process Library systemd-login offers possibility to display name of login session for specific pid. Note that not all processes are part of a login session (e.g. system service processes, user processes that are shared between multiple sessions of the same user, or kernel threads). This patch adds output option "sd_session" which will show name of session or "-", when process does not belong to any session. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-16 19:28:32 +05:30
static int pr_sd_session(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_SESS)
return snprintf(outbuf, COLWID, "%s", rSv(SD_SESS, str, pp));
ps: possibility to display login session for a process Library systemd-login offers possibility to display name of login session for specific pid. Note that not all processes are part of a login session (e.g. system service processes, user processes that are shared between multiple sessions of the same user, or kernel threads). This patch adds output option "sd_session" which will show name of session or "-", when process does not belong to any session. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-16 19:28:32 +05:30
}
ps: possibility to display uid of session owner for a process Library systemd-login offers possibility to display the Unix user identifier of the owner of the session of a process. This information will also be displayed for user processes which are shared between multiple login sessions of the same user, where sd_session will be blank. This patch adds output option "sd_ouid" which will show user UID or "-", when there is no owner for a process. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-17 14:02:50 +05:30
static int pr_sd_ouid(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_OUID)
return snprintf(outbuf, COLWID, "%s", rSv(SD_OUID, str, pp));
ps: possibility to display uid of session owner for a process Library systemd-login offers possibility to display the Unix user identifier of the owner of the session of a process. This information will also be displayed for user processes which are shared between multiple login sessions of the same user, where sd_session will be blank. This patch adds output option "sd_ouid" which will show user UID or "-", when there is no owner for a process. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-17 14:02:50 +05:30
}
ps: possibility to display machine name for a process Library systemd-login offers possibility to display the name of the VM or container which process belongs to. This patch adds output option "sd_machine" which will show machine name or "-" when the name can not be determined. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-22 16:03:31 +05:30
static int pr_sd_machine(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_MACH)
return snprintf(outbuf, COLWID, "%s", rSv(SD_MACH, str, pp));
ps: possibility to display machine name for a process Library systemd-login offers possibility to display the name of the VM or container which process belongs to. This patch adds output option "sd_machine" which will show machine name or "-" when the name can not be determined. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-22 16:03:31 +05:30
}
ps: possibility to display systemd user unit for a process Library systemd-login offers possibility to display name of systemd user unit for specific pid. Note that not all processes are part of a user unit. This patch adds output option "sd_uunit" which will show name of user unit or "-", when process does not belong to any user unit. This is similar to "sd_unit" but applies to user units instead of system units. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-22 16:26:02 +05:30
static int pr_sd_uunit(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_UUNIT)
return snprintf(outbuf, COLWID, "%s", rSv(SD_UUNIT, str, pp));
ps: possibility to display systemd user unit for a process Library systemd-login offers possibility to display name of systemd user unit for specific pid. Note that not all processes are part of a user unit. This patch adds output option "sd_uunit" which will show name of user unit or "-", when process does not belong to any user unit. This is similar to "sd_unit" but applies to user units instead of system units. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-22 16:26:02 +05:30
}
ps: possibility to display seat for a process Library systemd-login offers possibility to display name of seat for a session on multi-seat systems. This patch adds output option "sd_seat" which will show name of seat or "-", when name of seat can not be determined, but "seat0" should always exist. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-22 16:46:33 +05:30
static int pr_sd_seat(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_SEAT)
return snprintf(outbuf, COLWID, "%s", rSv(SD_SEAT, str, pp));
ps: possibility to display seat for a process Library systemd-login offers possibility to display name of seat for a session on multi-seat systems. This patch adds output option "sd_seat" which will show name of seat or "-", when name of seat can not be determined, but "seat0" should always exist. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-04-22 16:46:33 +05:30
}
ps: possibility to display slice unit for a process Library systemd-login offers possibility to display name of a systemd slice unit for specific pid. This patch adds output option "slice" which will show name of systemd slice unit. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-08-07 15:27:24 +05:30
static int pr_sd_slice(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(SD_SLICE)
return snprintf(outbuf, COLWID, "%s", rSv(SD_SLICE, str, pp));
ps: possibility to display slice unit for a process Library systemd-login offers possibility to display name of a systemd slice unit for specific pid. This patch adds output option "slice" which will show name of systemd slice unit. To maintain compatibility with non-systemd systems, procps must be configured with --with-systemd option to enable this option.
2013-08-07 15:27:24 +05:30
}
procps: add support for linux namespaces Each process in Linux has a /proc/<pid>/ns directory which contains symbolic links to pipes that identify which namespaces that process belongs to. This patch adds support for ps to display that information optionally. Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
2013-04-09 00:33:13 +05:30
/************************ Linux namespaces ******************************/
#define _pr_ns(NAME, ID)\
static int pr_##NAME(char *restrict const outbuf, const proc_t *restrict const pp) {\
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(NS_ ## ID) \
if (rSv(NS_ ## ID, ul_int, pp)) \
return snprintf(outbuf, COLWID, "%lu", rSv(NS_ ## ID, ul_int, pp)); \
else \
return snprintf(outbuf, COLWID, "-"); \
}
ps: make those namespaces up to date with linux kernel Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-05-05 10:30:00 +05:30
_pr_ns(cgroupns, CGROUP);
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
_pr_ns(ipcns, IPC);
_pr_ns(mntns, MNT);
_pr_ns(netns, NET);
_pr_ns(pidns, PID);
ps: make those namespaces up to date with linux kernel Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-05-05 10:30:00 +05:30
_pr_ns(timens, TIME);
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
_pr_ns(userns, USER);
_pr_ns(utsns, UTS);
#undef _pr_ns
procps: add support for linux namespaces Each process in Linux has a /proc/<pid>/ns directory which contains symbolic links to pipes that identify which namespaces that process belongs to. This patch adds support for ps to display that information optionally. Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
2013-04-09 00:33:13 +05:30
ps: add code to exploit the new library LXC containers Reference(s): https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1424253 https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1424253 Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-06-13 10:30:00 +05:30
/************************ Linux containers ******************************/
static int pr_lxcname(char *restrict const outbuf, const proc_t *restrict const pp){
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(LXCNAME)
return snprintf(outbuf, COLWID, "%s", rSv(LXCNAME, str, pp));
ps: add code to exploit the new library LXC containers Reference(s): https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1424253 https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1424253 Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-06-13 10:30:00 +05:30
}
NSA SELinux for Linux 2.6.xx
2003-12-24 09:48:24 +05:30
/****************** FLASK & seLinux security stuff **********************/
// move the bulk of this to libproc sometime
turn off new SE Linux code for now
2005-10-30 09:14:26 +05:30
// This needs more study, considering:
// 1. the static linking option (maybe disable this in that case)
// 2. the -z and -Z option issue
// 3. width of output
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
static int pr_context(char *restrict const outbuf, const proc_t *restrict const pp){
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
static void (*ps_freecon)(char*);
static int (*ps_getpidcon)(pid_t pid, char **context);
misc: just eliminate several 'unused' warning messages [ plus we also play catch up on some earlier changes ] [ that impacted skill.c, after using --enable-skill! ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-19 10:30:00 +05:30
#if ENABLE_LIBSELINUX
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
static int (*ps_is_selinux_enabled)(void);
static int tried_load;
misc: just eliminate several 'unused' warning messages [ plus we also play catch up on some earlier changes ] [ that impacted skill.c, after using --enable-skill! ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-19 10:30:00 +05:30
#endif
ps: move other initialization code after setREL macros While the previous patch concerned an essential change to avoid dereferencing those NULL pointers, this patch could be considered optional. For consistency, it just puts all initialization logic after the setREL macros. [ plus along the way some inter-function spacing was ] [ standardized with just a single blank line between ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-06 10:30:00 +05:30
static int selinux_enabled;
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
size_t len;
char *context;
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
setREL1(ID_TGID)
ps: use attr/current as fallback for context If SELINUX is enabled but the machine is using another MAC system (like apparmor), ps will fallback to just parsing "/proc/%d/attr/current", otherwise the label/context would not be properly displayed in that case. References: https://bugs.debian.org/786956 Signed-off-by: Craig Small <csmall@enc.com.au>
2016-01-03 12:41:51 +05:30
#if ENABLE_LIBSELINUX
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
if(!ps_getpidcon && !tried_load){
void *handle = dlopen("libselinux.so.1", RTLD_NOW);
if(handle){
ps: use attr/current as fallback for context If SELINUX is enabled but the machine is using another MAC system (like apparmor), ps will fallback to just parsing "/proc/%d/attr/current", otherwise the label/context would not be properly displayed in that case. References: https://bugs.debian.org/786956 Signed-off-by: Craig Small <csmall@enc.com.au>
2016-01-03 12:41:51 +05:30
ps_freecon = dlsym(handle, "freecon");
if(dlerror())
ps_freecon = 0;
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
dlerror();
ps_getpidcon = dlsym(handle, "getpidcon");
if(dlerror())
ps_getpidcon = 0;
ps: use attr/current as fallback for context If SELINUX is enabled but the machine is using another MAC system (like apparmor), ps will fallback to just parsing "/proc/%d/attr/current", otherwise the label/context would not be properly displayed in that case. References: https://bugs.debian.org/786956 Signed-off-by: Craig Small <csmall@enc.com.au>
2016-01-03 12:41:51 +05:30
ps_is_selinux_enabled = dlsym(handle, "is_selinux_enabled");
if(dlerror())
ps_is_selinux_enabled = 0;
else
selinux_enabled = ps_is_selinux_enabled();
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
}
tried_load++;
}
ps: use attr/current as fallback for context If SELINUX is enabled but the machine is using another MAC system (like apparmor), ps will fallback to just parsing "/proc/%d/attr/current", otherwise the label/context would not be properly displayed in that case. References: https://bugs.debian.org/786956 Signed-off-by: Craig Small <csmall@enc.com.au>
2016-01-03 12:41:51 +05:30
#endif
if(ps_getpidcon && selinux_enabled && !ps_getpidcon(rSv(ID_TGID, s_int, pp), &context)){
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
size_t max_len = OUTBUF_SIZE-1;
len = strlen(context);
if(len > max_len) len = max_len;
memcpy(outbuf, context, len);
0060-ps/output.c: Protect outbuf in various pr_*() functions. pr_bsdstart(): Replace "strcpy(outbuf," with "snprintf(outbuf, COLWID," (which is used in all surrounding functions). (side note: the fact that many pr_*() functions simply return "snprintf(outbuf, COLWID," justifies the "amount" checks added to show_one_proc() by the "ps/output.c: Replace strcpy() with snprintf() in show_one_proc()." patch) pr_stime(): Check the return value of strftime() (in case of an error, "the contents of the array are undefined"). help_pr_sig(): Handle the "len < 8" case, otherwise "sig+len-8" may point outside the sig string. pr_context(): Handle the empty string case, or else "outbuf[len-1]" points outside outbuf. ---------------------------- adapted for newlib branch . logic is quite different with 'stacks' vs. 'proc_t' Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if (len >= 1 && outbuf[len-1] == '\n') --len;
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
outbuf[len] = '\0';
ps: use attr/current as fallback for context If SELINUX is enabled but the machine is using another MAC system (like apparmor), ps will fallback to just parsing "/proc/%d/attr/current", otherwise the label/context would not be properly displayed in that case. References: https://bugs.debian.org/786956 Signed-off-by: Craig Small <csmall@enc.com.au>
2016-01-03 12:41:51 +05:30
ps_freecon(context);
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
}else{
ps: use attr/current as fallback for context If SELINUX is enabled but the machine is using another MAC system (like apparmor), ps will fallback to just parsing "/proc/%d/attr/current", otherwise the label/context would not be properly displayed in that case. References: https://bugs.debian.org/786956 Signed-off-by: Craig Small <csmall@enc.com.au>
2016-01-03 12:41:51 +05:30
char filename[48];
ssize_t num_read;
int fd;
snprintf(filename, sizeof filename, "/proc/%d/attr/current", rSv(ID_TGID, s_int, pp));
if ((fd = open(filename, O_RDONLY, 0)) != -1) {
num_read = read(fd, outbuf, OUTBUF_SIZE-1);
close(fd);
if (num_read > 0) {
outbuf[num_read] = '\0';
len = 0;
while(isprint(outbuf[len]))
len++;
outbuf[len] = '\0';
if(len)
return len;
}
}
SE Linux alias translation code (broken)
2005-10-30 08:15:45 +05:30
outbuf[0] = '-';
outbuf[1] = '\0';
len = 1;
}
return len;
}
ps: making the libselinux support configurable Previously the libselinux support was present in the sources, but disabled with a preprocessor condition (#if 0). From now the libselinux support can be enabled with the --enable-libselinux switch available in the configuration script. That way is more flexible than local patches modifying the condition value from 0 to 1.
2013-08-07 21:22:38 +05:30
ps: added 2 new fields for displaying autogroup values Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-08-06 10:30:00 +05:30
/************************ Linux autogroups ******************************/
static int pr_agid(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(AUTOGRP_ID)
return snprintf(outbuf, COLWID, "%d", rSv(AUTOGRP_ID, s_int, pp));
}
static int pr_agnice(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(AUTOGRP_NICE)
return snprintf(outbuf, COLWID, "%d", rSv(AUTOGRP_NICE, s_int, pp));
}
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
////////////////////////////// Test code /////////////////////////////////
// like "args"
static int pr_t_unlimited(char *restrict const outbuf, const proc_t *restrict const pp){
static const char *const vals[] = {"[123456789-12345] <defunct>","ps","123456789-123456"};
ps: Stop crash if using test fields I'm not sure if anyone actually uses these things, but if you selected test fields on the command line ps would crash. $ ps/pscommand -o _left Signal 11 (SEGV) caught by pscommand (3.3.11.877-0488). /home/csmall/Projects/procps/procps/ps/.libs/pscommand:ps/display.c:66: please report this bug Segmentation fault Anyway, it doesn't now: $ ps/pscommand -o pid,_left,_left2,_right,_unlimited 1 PID LLLLLLLL L2L2L2L2 RRRRRRRRRRR U 1 tty7 3270/tty4 59:59 [123456789-12345] <defunct>
2020-12-22 12:20:17 +05:30
if (!outbuf) return 0;
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
(void)pp;
fix built-in test code
2005-01-11 03:02:49 +05:30
snprintf(outbuf, max_rightward+1, "%s", vals[lines_to_next_header%3u]);
return strlen(outbuf);
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
}
static int pr_t_unlimited2(char *restrict const outbuf, const proc_t *restrict const pp){
static const char *const vals[] = {"unlimited", "[123456789-12345] <defunct>","ps","123456789-123456"};
ps: Stop crash if using test fields I'm not sure if anyone actually uses these things, but if you selected test fields on the command line ps would crash. $ ps/pscommand -o _left Signal 11 (SEGV) caught by pscommand (3.3.11.877-0488). /home/csmall/Projects/procps/procps/ps/.libs/pscommand:ps/display.c:66: please report this bug Segmentation fault Anyway, it doesn't now: $ ps/pscommand -o pid,_left,_left2,_right,_unlimited 1 PID LLLLLLLL L2L2L2L2 RRRRRRRRRRR U 1 tty7 3270/tty4 59:59 [123456789-12345] <defunct>
2020-12-22 12:20:17 +05:30
if (!outbuf) return 0;
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
(void)pp;
fix built-in test code
2005-01-11 03:02:49 +05:30
snprintf(outbuf, max_rightward+1, "%s", vals[lines_to_next_header%4u]);
return strlen(outbuf);
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
}
// like "etime"
static int pr_t_right(char *restrict const outbuf, const proc_t *restrict const pp){
static const char *const vals[] = {"999-23:59:59","99-23:59:59","9-23:59:59","59:59"};
ps: Stop crash if using test fields I'm not sure if anyone actually uses these things, but if you selected test fields on the command line ps would crash. $ ps/pscommand -o _left Signal 11 (SEGV) caught by pscommand (3.3.11.877-0488). /home/csmall/Projects/procps/procps/ps/.libs/pscommand:ps/display.c:66: please report this bug Segmentation fault Anyway, it doesn't now: $ ps/pscommand -o pid,_left,_left2,_right,_unlimited 1 PID LLLLLLLL L2L2L2L2 RRRRRRRRRRR U 1 tty7 3270/tty4 59:59 [123456789-12345] <defunct>
2020-12-22 12:20:17 +05:30
if (!outbuf) return 0;
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
(void)pp;
return snprintf(outbuf, COLWID, "%s", vals[lines_to_next_header%4u]);
}
static int pr_t_right2(char *restrict const outbuf, const proc_t *restrict const pp){
static const char *const vals[] = {"999-23:59:59","99-23:59:59","9-23:59:59"};
ps: Stop crash if using test fields I'm not sure if anyone actually uses these things, but if you selected test fields on the command line ps would crash. $ ps/pscommand -o _left Signal 11 (SEGV) caught by pscommand (3.3.11.877-0488). /home/csmall/Projects/procps/procps/ps/.libs/pscommand:ps/display.c:66: please report this bug Segmentation fault Anyway, it doesn't now: $ ps/pscommand -o pid,_left,_left2,_right,_unlimited 1 PID LLLLLLLL L2L2L2L2 RRRRRRRRRRR U 1 tty7 3270/tty4 59:59 [123456789-12345] <defunct>
2020-12-22 12:20:17 +05:30
if (!outbuf) return 0;
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
(void)pp;
return snprintf(outbuf, COLWID, "%s", vals[lines_to_next_header%3u]);
}
// like "tty"
static int pr_t_left(char *restrict const outbuf, const proc_t *restrict const pp){
static const char *const vals[] = {"tty7","pts/9999","iseries/vtty42","ttySMX0","3270/tty4"};
ps: Stop crash if using test fields I'm not sure if anyone actually uses these things, but if you selected test fields on the command line ps would crash. $ ps/pscommand -o _left Signal 11 (SEGV) caught by pscommand (3.3.11.877-0488). /home/csmall/Projects/procps/procps/ps/.libs/pscommand:ps/display.c:66: please report this bug Segmentation fault Anyway, it doesn't now: $ ps/pscommand -o pid,_left,_left2,_right,_unlimited 1 PID LLLLLLLL L2L2L2L2 RRRRRRRRRRR U 1 tty7 3270/tty4 59:59 [123456789-12345] <defunct>
2020-12-22 12:20:17 +05:30
if (!outbuf) return 0;
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
(void)pp;
return snprintf(outbuf, COLWID, "%s", vals[lines_to_next_header%5u]);
}
static int pr_t_left2(char *restrict const outbuf, const proc_t *restrict const pp){
static const char *const vals[] = {"tty7","pts/9999","ttySMX0","3270/tty4"};
ps: Stop crash if using test fields I'm not sure if anyone actually uses these things, but if you selected test fields on the command line ps would crash. $ ps/pscommand -o _left Signal 11 (SEGV) caught by pscommand (3.3.11.877-0488). /home/csmall/Projects/procps/procps/ps/.libs/pscommand:ps/display.c:66: please report this bug Segmentation fault Anyway, it doesn't now: $ ps/pscommand -o pid,_left,_left2,_right,_unlimited 1 PID LLLLLLLL L2L2L2L2 RRRRRRRRRRR U 1 tty7 3270/tty4 59:59 [123456789-12345] <defunct>
2020-12-22 12:20:17 +05:30
if (!outbuf) return 0;
ps: built-in test code, etc.
2004-10-12 05:42:25 +05:30
(void)pp;
return snprintf(outbuf, COLWID, "%s", vals[lines_to_next_header%4u]);
}
procps 010114
2002-02-02 04:17:29 +05:30
/***************************************************************************/
/*************************** other stuff ***********************************/
/*
* Old header specifications.
*
* short Up " PID TTY STAT TIME COMMAND"
* long l Pp " FLAGS UID PID PPID PRI NI SIZE RSS WCHAN STA TTY TIME COMMAND
* user u up "USER PID %CPU %MEM SIZE RSS TTY STAT START TIME COMMAND
* jobs j gPp " PPID PID PGID SID TTY TPGID STAT UID TIME COMMAND
* sig s p " UID PID SIGNAL BLOCKED IGNORED CATCHED STAT TTY TIME COMMAND
* vm v r " PID TTY STAT TIME PAGEIN TSIZ DSIZ RSS LIM %MEM COMMAND
* m m r " PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND
* regs X p "NR PID STACK ESP EIP TMOUT ALARM STAT TTY TIME COMMAND
*/
/*
* Unix98 requires that the heading for tty is TT, though XPG4, Digital,
* and BSD use TTY. The Unix98 headers are:
* args,comm,etime,group,nice,pcpu,pgid
* pid,ppid,rgroup,ruser,time,tty,user,vsz
*
* BSD c: "command" becomes accounting name ("comm" or "ucomm")
* BSD n: "user" becomes "uid" and "wchan" becomes "nwchan" (number)
*/
ugly wart gone
2003-09-28 22:53:29 +05:30
/* Justification control for flags field. */
#define USER CF_USER // left if text, right if numeric
#define LEFT CF_LEFT
#define RIGHT CF_RIGHT
#define UNLIMITED CF_UNLIMITED
#define WCHAN CF_WCHAN // left if text, right if numeric
#define SIGNAL CF_SIGNAL // right in 9, or 16 if room
#define PIDMAX CF_PIDMAX
#define TO CF_PRINT_THREAD_ONLY
#define PO CF_PRINT_PROCESS_ONLY
#define ET CF_PRINT_EVERY_TIME
#define AN CF_PRINT_AS_NEEDED // no idea
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
/* TODO
* pull out annoying BSD aliases into another table (to macro table?)
* add sorting functions here (to unify names)
*/
/* temporary hack -- mark new stuff grabbed from Debian ps */
#define LNx LNX
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
/* Note: upon conversion to the <pids> API the numerous former sort provisions
for otherwise non-printable fields (pr_nop) have been retained. And,
since the new library can sort on any item, many previously printable
but unsortable fields have now been made sortable. */
Jim needs restrictions
2002-11-27 05:54:01 +05:30
/* there are about 211 listed */
procps 010114
2002-02-02 04:17:29 +05:30
/* Many of these are placeholders for unsupported options. */
ps: exploit those new <pids> task/threads capabilities This commit represents the ps transition to the <pids> 'stacks' interface. While an effort to minimize impact on existing code was made (as with a disguised proc_t) the changes were still extensive. Along the way, a few modifications beyond simply conversion were also made. ------------------------------------------------------ Here's a brief overview the design of this conversion: . The need to satisfy relative enum requirements could not easily have been made table driven since any entry in the format_array might require several <pids> items in support. So I decided to allow every print function to contribute its own relative enums once the decision as to exactly what will be printed had been finalized. . A similar approach was taken for sorting, since it's possible to have sort keys that will not be displayed. Here, I relied on the existing print extensions above. . In summary, just prior to printing ps walks thru two lists one time (the format_list & sort_list) and calls each print function. That function does not print, but sets its required enum if necessary. Later, when those same functions are called repeatedly for every printed line, the only overhead will be an if test and branch. ------------------------------------------------------ Below is a summary of major changes beyond conversion: . Sorts are now the responsibility of the library. And therefore the total # of sortable fields substantially increased without effort. Additionally, several quirky fields remain as sortable, even though they can't ever be printed(?). Surely that must make sense to someone. [ while on this subject of sort, please do *not* try ] [ to sort old ps on 'args'. or better yet, if you do ] [ try that sort, see if you can determine his order, ] [ without peeking at the source. that one hurts yet! ] . All logic dealing with the old openproc flags and ps struct members known as 'need' have been whacked since that entire area was solely the new library's concern. . Remaining malloc/calloc calls to stdlib were changed to xmalloc/xcalloc from our own include/xalloc.h file. None of the replaced calls ever checked return values. [ be aware that 2 minor potential memory leaks exist ] [ depending on command line arguments. no attempt is ] [ made to free dynamically acquired format/sort node ] [ structures upon return; a conscious design choice. ] Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-10-03 10:30:00 +05:30
static const format_struct format_array[] = { /*
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
.spec .head .pr .sr .width .vendor .flags */
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
{"%cpu", "%CPU", pr_pcpu, PIDS_UTILIZATION, 4, BSD, ET|RIGHT}, /*pcpu*/
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"%mem", "%MEM", pr_pmem, PIDS_VM_RSS, 4, BSD, PO|RIGHT}, /*pmem*/
{"_left", "LLLLLLLL", pr_t_left, PIDS_noop, 8, TST, ET|LEFT},
{"_left2", "L2L2L2L2", pr_t_left2, PIDS_noop, 8, TST, ET|LEFT},
{"_right", "RRRRRRRRRRR", pr_t_right, PIDS_noop, 11, TST, ET|RIGHT},
{"_right2", "R2R2R2R2R2R", pr_t_right2, PIDS_noop, 11, TST, ET|RIGHT},
{"_unlimited","U", pr_t_unlimited, PIDS_noop, 16, TST, ET|UNLIMITED},
{"_unlimited2","U2", pr_t_unlimited2, PIDS_noop, 16, TST, ET|UNLIMITED},
{"acflag", "ACFLG", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT}, /*acflg*/
{"acflg", "ACFLG", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT}, /*acflag*/
{"addr", "ADDR", pr_nop, PIDS_noop, 4, XXX, AN|RIGHT},
{"addr_1", "ADDR", pr_nop, PIDS_noop, 1, LNX, AN|LEFT},
ps: added 2 new fields for displaying autogroup values Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-08-06 10:30:00 +05:30
{"ag_id", "AGID", pr_agid, PIDS_AUTOGRP_ID, 5, LNX, AN|RIGHT},
{"ag_nice", "AGNI", pr_agnice, PIDS_AUTOGRP_NICE, 4, LNX, AN|RIGHT},
ps: respond to loss of fields obsoleted with linux 2.6 Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-09-28 22:42:12 +05:30
{"alarm", "ALARM", pr_nop, PIDS_noop, 5, LNX, AN|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"argc", "ARGC", pr_nop, PIDS_noop, 4, LNX, PO|RIGHT},
{"args", "COMMAND", pr_args, PIDS_CMDLINE, 27, U98, PO|UNLIMITED}, /*command*/
{"atime", "TIME", pr_time, PIDS_TIME_ALL, 8, SOE, ET|RIGHT}, /*cputime*/ /* was 6 wide */
{"blocked", "BLOCKED", pr_sigmask, PIDS_SIGBLOCKED, 9, BSD, TO|SIGNAL},/*sigmask*/
{"bnd", "BND", pr_nop, PIDS_noop, 1, AIX, TO|RIGHT},
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
{"bsdstart", "START", pr_bsdstart, PIDS_TICS_BEGAN, 6, LNX, ET|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"bsdtime", "TIME", pr_bsdtime, PIDS_TICS_ALL, 6, LNX, ET|RIGHT},
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
{"c", "C", pr_c, PIDS_UTILIZATION, 2, SUN, ET|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"caught", "CAUGHT", pr_sigcatch, PIDS_SIGCATCH, 9, BSD, TO|SIGNAL}, /*sigcatch*/
{"cgname", "CGNAME", pr_cgname, PIDS_CGNAME, 27, LNX, PO|UNLIMITED},
{"cgroup", "CGROUP", pr_cgroup, PIDS_CGROUP, 27, LNX, PO|UNLIMITED},
ps: make those namespaces up to date with linux kernel Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-05-05 10:30:00 +05:30
{"cgroupns", "CGROUPNS",pr_cgroupns, PIDS_NS_CGROUP, 10, LNX, ET|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"class", "CLS", pr_class, PIDS_SCHED_CLASS, 3, XXX, TO|LEFT},
{"cls", "CLS", pr_class, PIDS_SCHED_CLASS, 3, HPU, TO|RIGHT}, /*says HPUX or RT*/
{"cmaj_flt", "-", pr_nop, PIDS_noop, 1, LNX, AN|RIGHT},
{"cmd", "CMD", pr_args, PIDS_CMDLINE, 27, DEC, PO|UNLIMITED}, /*ucomm*/
{"cmin_flt", "-", pr_nop, PIDS_noop, 1, LNX, AN|RIGHT},
{"cnswap", "-", pr_nop, PIDS_noop, 1, LNX, AN|RIGHT},
{"comm", "COMMAND", pr_comm, PIDS_CMD, 15, U98, PO|UNLIMITED}, /*ucomm*/
{"command", "COMMAND", pr_args, PIDS_CMDLINE, 27, XXX, PO|UNLIMITED}, /*args*/
{"context", "CONTEXT", pr_context, PIDS_ID_TGID, 31, LNX, ET|LEFT},
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
{"cp", "CP", pr_cp, PIDS_UTILIZATION, 3, DEC, ET|RIGHT}, /*cpu*/
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"cpu", "CPU", pr_nop, PIDS_noop, 3, BSD, AN|RIGHT}, /* FIXME ... HP-UX wants this as the CPU number for SMP? */
{"cpuid", "CPUID", pr_psr, PIDS_PROCESSOR, 5, BSD, TO|RIGHT}, // OpenBSD: 8 wide!
{"cputime", "TIME", pr_time, PIDS_TIME_ALL, 8, DEC, ET|RIGHT}, /*time*/
ps: add times & cputimes format specifiers: cumulative CPU time in seconds These format specifiers are to time & cputime what etimes is to etime. Signed-off-by: Sébastien Bigaret <sebastien.bigaret@telecom-bretagne.eu> References: procps-ng/procps!43
2017-03-11 12:10:19 +05:30
{"cputimes", "TIME", pr_times, PIDS_TIME_ALL, 8, LNX, ET|RIGHT}, /*time*/
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"ctid", "CTID", pr_nop, PIDS_noop, 5, SUN, ET|RIGHT}, // resource contracts?
ps: that '%CUC' column must be just a little bit wider Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-04-20 10:30:00 +05:30
{"cuc", "%CUC", pr_utilization_c, PIDS_UTILIZATION_C, 7, XXX, AN|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"cursig", "CURSIG", pr_nop, PIDS_noop, 6, DEC, AN|RIGHT},
{"cutime", "-", pr_nop, PIDS_TICS_USER_C, 1, LNX, AN|RIGHT},
ps: exploit the library addition for 'cpu utilization' This just parallels the top program by adding that new library PIDS_UTILIZATION item to the ps repertoire. It should be noted, however, that the new %CUU field is a little redundant. I mean, ps already has 4 such fields implemented identified as: '%cpu', 'c', 'cp' & 'pcpu'. Oh well, at least the newest one offers a little value added in the form of extra precision. We'll follow the top lead and display results in the form of: '##.###'. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-04 11:30:00 +05:30
{"cuu", "%CUU", pr_utilization, PIDS_UTILIZATION, 6, XXX, AN|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"cwd", "CWD", pr_nop, PIDS_noop, 3, LNX, AN|LEFT},
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"drs", "DRS", pr_drs, PIDS_VSIZE_BYTES, 5, LNX, PO|RIGHT},
{"dsiz", "DSIZ", pr_dsiz, PIDS_VSIZE_BYTES, 4, LNX, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"egid", "EGID", pr_egid, PIDS_ID_EGID, 5, LNX, ET|RIGHT},
{"egroup", "EGROUP", pr_egroup, PIDS_ID_EGROUP, 8, LNX, ET|USER},
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
{"eip", "EIP", pr_eip, PIDS_ADDR_CURR_EIP, (int)(2*sizeof(long)), LNX, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"emul", "EMUL", pr_nop, PIDS_noop, 13, BSD, PO|LEFT}, /* "FreeBSD ELF32" and such */
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
{"end_code", "E_CODE", pr_nop, PIDS_ADDR_CODE_END, (int)(2*sizeof(long)), LNx, PO|RIGHT}, // sortable, but unprintable ??
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"environ","ENVIRONMENT",pr_nop, PIDS_noop, 11, LNx, PO|UNLIMITED},
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
{"esp", "ESP", pr_esp, PIDS_ADDR_CURR_ESP, (int)(2*sizeof(long)), LNX, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"etime", "ELAPSED", pr_etime, PIDS_TIME_ELAPSED, 11, U98, ET|RIGHT}, /* was 7 wide */
{"etimes", "ELAPSED", pr_etimes, PIDS_TIME_ELAPSED, 7, BSD, ET|RIGHT}, /* FreeBSD */
{"euid", "EUID", pr_euid, PIDS_ID_EUID, 5, LNX, ET|RIGHT},
{"euser", "EUSER", pr_euser, PIDS_ID_EUSER, 8, LNX, ET|USER},
ps: exploited that newly added field 'executable path' Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-06-22 10:30:00 +05:30
{"exe", "EXE", pr_exe, PIDS_EXE, 27, LNX, PO|UNLIMITED},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"f", "F", pr_flag, PIDS_FLAGS, 1, XXX, ET|RIGHT}, /*flags*/
{"fgid", "FGID", pr_fgid, PIDS_FLAGS, 5, LNX, ET|RIGHT},
{"fgroup", "FGROUP", pr_fgroup, PIDS_ID_FGROUP, 8, LNX, ET|USER},
{"flag", "F", pr_flag, PIDS_FLAGS, 1, DEC, ET|RIGHT},
{"flags", "F", pr_flag, PIDS_FLAGS, 1, BSD, ET|RIGHT}, /*f*/ /* was FLAGS, 8 wide */
{"fname", "COMMAND", pr_fname, PIDS_CMD, 8, SUN, PO|LEFT},
{"fsgid", "FSGID", pr_fgid, PIDS_ID_FGID, 5, LNX, ET|RIGHT},
{"fsgroup", "FSGROUP", pr_fgroup, PIDS_ID_FGROUP, 8, LNX, ET|USER},
{"fsuid", "FSUID", pr_fuid, PIDS_ID_FUID, 5, LNX, ET|RIGHT},
{"fsuser", "FSUSER", pr_fuser, PIDS_ID_FUSER, 8, LNX, ET|USER},
{"fuid", "FUID", pr_fuid, PIDS_ID_FUID, 5, LNX, ET|RIGHT},
{"fuser", "FUSER", pr_fuser, PIDS_ID_FUSER, 8, LNX, ET|USER},
{"gid", "GID", pr_egid, PIDS_ID_EGID, 5, SUN, ET|RIGHT},
{"group", "GROUP", pr_egroup, PIDS_ID_EGROUP, 8, U98, ET|USER},
{"ignored", "IGNORED", pr_sigignore, PIDS_SIGIGNORE, 9, BSD, TO|SIGNAL},/*sigignore*/
{"inblk", "INBLK", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT}, /*inblock*/
{"inblock", "INBLK", pr_nop, PIDS_noop, 5, DEC, AN|RIGHT}, /*inblk*/
{"intpri", "PRI", pr_opri, PIDS_PRIORITY, 3, HPU, TO|RIGHT},
{"ipcns", "IPCNS", pr_ipcns, PIDS_NS_IPC, 10, LNX, ET|RIGHT},
{"jid", "JID", pr_nop, PIDS_noop, 1, SGI, PO|RIGHT},
{"jobc", "JOBC", pr_nop, PIDS_noop, 4, XXX, AN|RIGHT},
{"ktrace", "KTRACE", pr_nop, PIDS_noop, 8, BSD, AN|RIGHT},
{"ktracep", "KTRACEP", pr_nop, PIDS_noop, 8, BSD, AN|RIGHT},
{"label", "LABEL", pr_context, PIDS_ID_TGID, 31, SGI, ET|LEFT},
{"lastcpu", "C", pr_psr, PIDS_PROCESSOR, 3, BSD, TO|RIGHT}, // DragonFly
{"lim", "LIM", pr_lim, PIDS_RSS_RLIM, 5, BSD, AN|RIGHT},
{"login", "LOGNAME", pr_nop, PIDS_noop, 8, BSD, AN|LEFT}, /*logname*/ /* double check */
{"logname", "LOGNAME", pr_nop, PIDS_noop, 8, XXX, AN|LEFT}, /*login*/
{"longtname", "TTY", pr_tty8, PIDS_TTY_NAME, 8, DEC, PO|LEFT},
{"lsession", "SESSION", pr_sd_session, PIDS_SD_SESS, 11, LNX, ET|LEFT},
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
{"lstart", "STARTED", pr_lstart, PIDS_TICS_BEGAN, 24, XXX, ET|RIGHT},
ps: changed to exploit a newly added UID used at login This patch represents a newlib adaptation of the merge request offered by Jan Rybar that is referenced below. Reference(s): https://gitlab.com/procps-ng/procps/merge_requests/57 https://bugzilla.redhat.com/show_bug.cgi?id=1518986 Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-02-11 13:52:22 +05:30
{"luid", "LUID", pr_luid, PIDS_ID_LOGIN, 5, LNX, ET|RIGHT}, /* login ID */
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"luser", "LUSER", pr_nop, PIDS_noop, 8, LNX, ET|USER}, /* login USER */
{"lwp", "LWP", pr_tasks, PIDS_ID_PID, 5, SUN, TO|PIDMAX|RIGHT},
{"lxc", "LXC", pr_lxcname, PIDS_LXCNAME, 8, LNX, ET|LEFT},
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"m_drs", "DRS", pr_drs, PIDS_VSIZE_BYTES, 5, LNx, PO|RIGHT},
ps: respond to loss of fields obsoleted with linux 2.6 Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-09-28 22:42:12 +05:30
{"m_dt", "DT", pr_nop, PIDS_noop, 4, LNx, PO|RIGHT},
{"m_lrs", "LRS", pr_nop, PIDS_noop, 5, LNx, PO|RIGHT},
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
{"m_resident", "RES", pr_nop, PIDS_MEM_RES_PGS, 5, LNx, PO|RIGHT},
{"m_share", "SHRD", pr_nop, PIDS_MEM_SHR_PGS, 5, LNx, PO|RIGHT},
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"m_size", "SIZE", pr_size, PIDS_VSIZE_BYTES, 5, LNX, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"m_swap", "SWAP", pr_nop, PIDS_noop, 5, LNx, PO|RIGHT},
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"m_trs", "TRS", pr_trs, PIDS_VSIZE_BYTES, 5, LNx, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"machine", "MACHINE", pr_sd_machine, PIDS_SD_MACH, 31, LNX, ET|LEFT},
{"maj_flt", "MAJFL", pr_majflt, PIDS_FLT_MAJ, 6, LNX, AN|RIGHT},
{"majflt", "MAJFLT", pr_majflt, PIDS_FLT_MAJ, 6, XXX, AN|RIGHT},
{"min_flt", "MINFL", pr_minflt, PIDS_FLT_MIN, 6, LNX, AN|RIGHT},
{"minflt", "MINFLT", pr_minflt, PIDS_FLT_MIN, 6, XXX, AN|RIGHT},
{"mntns", "MNTNS", pr_mntns, PIDS_NS_MNT, 10, LNX, ET|RIGHT},
{"msgrcv", "MSGRCV", pr_nop, PIDS_noop, 6, XXX, AN|RIGHT},
{"msgsnd", "MSGSND", pr_nop, PIDS_noop, 6, XXX, AN|RIGHT},
{"mwchan", "MWCHAN", pr_nop, PIDS_noop, 6, BSD, TO|WCHAN}, /* mutex (FreeBSD) */
{"netns", "NETNS", pr_netns, PIDS_NS_NET, 10, LNX, ET|RIGHT},
{"ni", "NI", pr_nice, PIDS_NICE, 3, BSD, TO|RIGHT}, /*nice*/
{"nice", "NI", pr_nice, PIDS_NICE, 3, U98, TO|RIGHT}, /*ni*/
{"nivcsw", "IVCSW", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT},
{"nlwp", "NLWP", pr_nlwp, PIDS_NLWP, 4, SUN, PO|RIGHT},
{"nsignals", "NSIGS", pr_nop, PIDS_noop, 5, DEC, AN|RIGHT}, /*nsigs*/
{"nsigs", "NSIGS", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT}, /*nsignals*/
{"nswap", "NSWAP", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT},
ps: have now added the NUMA node field display support Reference(s): https://gitlab.com/procps-ng/procps/issues/58 Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-05-12 10:35:00 +05:30
{"numa", "NUMA", pr_numa, PIDS_PROCESSOR_NODE, 4, XXX, AN|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"nvcsw", "VCSW", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT},
ps: respond to loss of that PIDS_WCHAN_ADDR enumerator No longer will ps print nwchan as 'ffffff', '-' or '1' since the proc/PID/stat wchan field didn't represent a real address anyway. Rather, the field will henceforth output a dash ('-'), the ps customary 'not available'. That man document was also tweaked to better represent actual behavior. An asterisk ('*') was never shown for threaded tasks and that dash ('-') usually didn't mean running tasks (sometimes associated with permissions). Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-10-07 16:25:55 +05:30
{"nwchan", "WCHAN", pr_nop, PIDS_noop, 6, XXX, TO|RIGHT},
ps: Add OOM and OOMADJ fields top has had the OOMs and OOMa fields since 2011. Ten years its probably time that ps had these fields added too. ps output options have oom and oomadj for OOM Score and OOM Adjustment respectively. References: procps-ng/procps#198 commit 367fd902dab64b51ba49709004b5011440e3105a https://www.freelists.org/post/procps/PATCH-12-Add-missed-oom-support-to-libproc
2021-03-05 11:52:29 +05:30
{"oom", "OOM", pr_oom, PIDS_OOM_SCORE, 4, XXX, TO|RIGHT},
{"oomadj", "OOMADJ", pr_oom_adj, PIDS_OOM_ADJ, 5, XXX, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"opri", "PRI", pr_opri, PIDS_PRIORITY, 3, SUN, TO|RIGHT},
{"osz", "SZ", pr_nop, PIDS_noop, 2, SUN, PO|RIGHT},
{"oublk", "OUBLK", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT}, /*oublock*/
{"oublock", "OUBLK", pr_nop, PIDS_noop, 5, DEC, AN|RIGHT}, /*oublk*/
{"ouid", "OWNER", pr_sd_ouid, PIDS_SD_OUID, 5, LNX, ET|LEFT},
{"p_ru", "P_RU", pr_nop, PIDS_noop, 6, BSD, AN|RIGHT},
{"paddr", "PADDR", pr_nop, PIDS_noop, 6, BSD, AN|RIGHT},
{"pagein", "PAGEIN", pr_majflt, PIDS_FLT_MAJ, 6, XXX, AN|RIGHT},
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
{"pcpu", "%CPU", pr_pcpu, PIDS_UTILIZATION, 4, U98, ET|RIGHT}, /*%cpu*/
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"pending", "PENDING", pr_sig, PIDS_SIGNALS, 9, BSD, ET|SIGNAL}, /*sig*/
{"pgid", "PGID", pr_pgid, PIDS_ID_PGRP, 5, U98, PO|PIDMAX|RIGHT},
{"pgrp", "PGRP", pr_pgid, PIDS_ID_PGRP, 5, LNX, PO|PIDMAX|RIGHT},
{"pid", "PID", pr_procs, PIDS_ID_TGID, 5, U98, PO|PIDMAX|RIGHT},
{"pidns", "PIDNS", pr_pidns, PIDS_NS_PID, 10, LNX, ET|RIGHT},
{"pmem", "%MEM", pr_pmem, PIDS_VM_RSS, 4, XXX, PO|RIGHT}, /* %mem */
{"poip", "-", pr_nop, PIDS_noop, 1, BSD, AN|RIGHT},
{"policy", "POL", pr_class, PIDS_SCHED_CLASS, 3, DEC, TO|LEFT},
{"ppid", "PPID", pr_ppid, PIDS_ID_PPID, 5, U98, PO|PIDMAX|RIGHT},
{"pri", "PRI", pr_pri, PIDS_PRIORITY, 3, XXX, TO|RIGHT},
{"pri_api", "API", pr_pri_api, PIDS_PRIORITY, 3, LNX, TO|RIGHT},
{"pri_bar", "BAR", pr_pri_bar, PIDS_PRIORITY, 3, LNX, TO|RIGHT},
{"pri_baz", "BAZ", pr_pri_baz, PIDS_PRIORITY, 3, LNX, TO|RIGHT},
{"pri_foo", "FOO", pr_pri_foo, PIDS_PRIORITY, 3, LNX, TO|RIGHT},
{"priority", "PRI", pr_priority, PIDS_PRIORITY, 3, LNX, TO|RIGHT},
{"prmgrp", "PRMGRP", pr_nop, PIDS_noop, 12, HPU, PO|RIGHT},
{"prmid", "PRMID", pr_nop, PIDS_noop, 12, HPU, PO|RIGHT},
{"project", "PROJECT", pr_nop, PIDS_noop, 12, SUN, PO|LEFT}, // see prm* andctid
{"projid", "PROJID", pr_nop, PIDS_noop, 5, SUN, PO|RIGHT},
{"pset", "PSET", pr_nop, PIDS_noop, 4, DEC, TO|RIGHT},
{"psr", "PSR", pr_psr, PIDS_PROCESSOR, 3, DEC, TO|RIGHT},
ps: Add PSS and USS fields The library added smaps_rollup fields in the referenced commit. This commit exploits the new fields to give pss and uss options. These options were first proposed back in 2015 by Petr Malat and, with the library update, they are finally made it into ps. Why use proportional or unique segment size? It is argued that these give a better idea of the "real" memory usage of a process. References: commit 12543b6c7690c379abc28e278cd804c05490a8b1 issue #112 https://www.freelists.org/post/procps/PSS-and-USS-support-for-ps https://lwn.net/Articles/230975/ Signed-off-by: Craig Small <csmall@dropbear.xyz>
2021-06-16 16:43:52 +05:30
{"pss", "PSS", pr_pss, PIDS_SMAP_PSS, 5, XXX, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"psxpri", "PPR", pr_nop, PIDS_noop, 3, DEC, TO|RIGHT},
ps: Add IO Accounting fields Add the fields for the IO accounting to ps as the library now has them added from previous commit. References: commit a7afe06e6f1b397b7404fbee724a51f88cc8a59c
2021-04-24 18:43:38 +05:30
{"rbytes", "RBYTES", pr_rbytes, PIDS_IO_READ_BYTES, 5, LNX, TO|RIGHT},
{"rchars", "RCHARS", pr_rchars, PIDS_IO_READ_CHARS, 5, LNX, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"re", "RE", pr_nop, PIDS_noop, 3, BSD, AN|RIGHT},
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
{"resident", "RES", pr_nop, PIDS_MEM_RES_PGS, 5, LNX, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"rgid", "RGID", pr_rgid, PIDS_ID_RGID, 5, XXX, ET|RIGHT},
{"rgroup", "RGROUP", pr_rgroup, PIDS_ID_RGROUP, 8, U98, ET|USER}, /* was 8 wide */
{"rlink", "RLINK", pr_nop, PIDS_noop, 8, BSD, AN|RIGHT},
ps: Add IO Accounting fields Add the fields for the IO accounting to ps as the library now has them added from previous commit. References: commit a7afe06e6f1b397b7404fbee724a51f88cc8a59c
2021-04-24 18:43:38 +05:30
{"rops", "ROPS", pr_rops, PIDS_IO_READ_OPS, 5, LNX, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"rss", "RSS", pr_rss, PIDS_VM_RSS, 5, XXX, PO|RIGHT}, /* was 5 wide */
{"rssize", "RSS", pr_rss, PIDS_VM_RSS, 5, DEC, PO|RIGHT}, /*rsz*/
{"rsz", "RSZ", pr_rss, PIDS_VM_RSS, 5, BSD, PO|RIGHT}, /*rssize*/
misc: adapted programs impacted by header file changes Signed-off-by: Jim Warner <james.warner@comcast.net>
2019-03-13 10:30:00 +05:30
{"rtprio", "RTPRIO", pr_rtprio, PIDS_PRIORITY_RT, 6, BSD, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"ruid", "RUID", pr_ruid, PIDS_ID_RUID, 5, XXX, ET|RIGHT},
{"ruser", "RUSER", pr_ruser, PIDS_ID_RUSER, 8, U98, ET|USER},
{"s", "S", pr_s, PIDS_STATE, 1, SUN, TO|LEFT}, /*stat,state*/
{"sched", "SCH", pr_sched, PIDS_SCHED_CLASS, 3, AIX, TO|RIGHT},
{"scnt", "SCNT", pr_nop, PIDS_noop, 4, DEC, AN|RIGHT}, /* man page misspelling of scount? */
{"scount", "SC", pr_nop, PIDS_noop, 4, AIX, AN|RIGHT}, /* scnt==scount, DEC claims both */
{"seat", "SEAT", pr_sd_seat, PIDS_SD_SEAT, 11, LNX, ET|LEFT},
{"sess", "SESS", pr_sess, PIDS_ID_SESSION, 5, XXX, PO|PIDMAX|RIGHT},
{"session", "SESS", pr_sess, PIDS_ID_SESSION, 5, LNX, PO|PIDMAX|RIGHT},
{"sgi_p", "P", pr_sgi_p, PIDS_STATE, 1, LNX, TO|RIGHT}, /* "cpu" number */
{"sgi_rss", "RSS", pr_rss, PIDS_VM_RSS, 4, LNX, PO|LEFT}, /* SZ:RSS */
{"sgid", "SGID", pr_sgid, PIDS_ID_SGID, 5, LNX, ET|RIGHT},
{"sgroup", "SGROUP", pr_sgroup, PIDS_ID_SGROUP, 8, LNX, ET|USER},
{"share", "-", pr_nop, PIDS_noop, 1, LNX, PO|RIGHT},
{"sid", "SID", pr_sess, PIDS_ID_SESSION, 5, XXX, PO|PIDMAX|RIGHT}, /* Sun & HP */
{"sig", "PENDING", pr_sig, PIDS_SIGNALS, 9, XXX, ET|SIGNAL}, /*pending -- Dragonfly uses this for whole-proc and "tsig" for thread */
{"sig_block", "BLOCKED", pr_sigmask, PIDS_SIGBLOCKED, 9, LNX, TO|SIGNAL},
{"sig_catch", "CATCHED", pr_sigcatch, PIDS_SIGCATCH, 9, LNX, TO|SIGNAL},
{"sig_ignore", "IGNORED",pr_sigignore, PIDS_SIGIGNORE, 9, LNX, TO|SIGNAL},
{"sig_pend", "SIGNAL", pr_sig, PIDS_SIGNALS, 9, LNX, ET|SIGNAL},
{"sigcatch", "CAUGHT", pr_sigcatch, PIDS_SIGCATCH, 9, XXX, TO|SIGNAL}, /*caught*/
{"sigignore", "IGNORED", pr_sigignore, PIDS_SIGIGNORE, 9, XXX, TO|SIGNAL}, /*ignored*/
{"sigmask", "BLOCKED", pr_sigmask, PIDS_SIGBLOCKED, 9, XXX, TO|SIGNAL}, /*blocked*/
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"size", "SIZE", pr_swapable, PIDS_VSIZE_BYTES, 5, SCO, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"sl", "SL", pr_nop, PIDS_noop, 3, XXX, AN|RIGHT},
{"slice", "SLICE", pr_sd_slice, PIDS_SD_SLICE, 31, LNX, ET|LEFT},
{"spid", "SPID", pr_tasks, PIDS_ID_PID, 5, SGI, TO|PIDMAX|RIGHT},
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
{"stackp", "STACKP", pr_stackp, PIDS_ADDR_STACK_START, (int)(2*sizeof(long)), LNX, PO|RIGHT}, /*start_stack*/
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
{"start", "STARTED", pr_start, PIDS_TICS_BEGAN, 8, XXX, ET|RIGHT},
misc: needed adaptations for the changes in <pids> api That snowball, which began as a simple removal of some brackets, now ends with this third patch restoring the ability to build our project. It was made necessary by the renaming (and rearranging) of several enumerators. Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-03-09 11:30:00 +05:30
{"start_code", "S_CODE", pr_nop, PIDS_ADDR_CODE_START, (int)(2*sizeof(long)), LNx, PO|RIGHT}, // sortable, but unprintable ??
{"start_stack", "STACKP",pr_stackp, PIDS_ADDR_STACK_START, (int)(2*sizeof(long)), LNX, PO|RIGHT}, /*stackp*/
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
{"start_time", "START", pr_stime, PIDS_TICS_BEGAN, 5, LNx, ET|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"stat", "STAT", pr_stat, PIDS_STATE, 4, BSD, TO|LEFT}, /*state,s*/
{"state", "S", pr_s, PIDS_STATE, 1, XXX, TO|LEFT}, /*stat,s*/ /* was STAT */
{"status", "STATUS", pr_nop, PIDS_noop, 6, DEC, AN|RIGHT},
ps: response to those library changes for 'TIME' stuff The library refactored 'TIME' items for consistency so we must adapt to some new data types and calculations. Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-02-26 11:30:00 +05:30
{"stime", "STIME", pr_stime, PIDS_TICS_BEGAN, 5, XXX, ET|RIGHT}, /* was 6 wide */
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"suid", "SUID", pr_suid, PIDS_ID_SUID, 5, LNx, ET|RIGHT},
{"supgid", "SUPGID", pr_supgid, PIDS_SUPGIDS, 20, LNX, PO|UNLIMITED},
{"supgrp", "SUPGRP", pr_supgrp, PIDS_SUPGROUPS, 40, LNX, PO|UNLIMITED},
{"suser", "SUSER", pr_suser, PIDS_ID_SUSER, 8, LNx, ET|USER},
{"svgid", "SVGID", pr_sgid, PIDS_ID_SGID, 5, XXX, ET|RIGHT},
{"svgroup", "SVGROUP", pr_sgroup, PIDS_ID_SGROUP, 8, LNX, ET|USER},
{"svuid", "SVUID", pr_suid, PIDS_ID_SUID, 5, XXX, ET|RIGHT},
{"svuser", "SVUSER", pr_suser, PIDS_ID_SUSER, 8, LNX, ET|USER},
{"systime", "SYSTEM", pr_nop, PIDS_noop, 6, DEC, ET|RIGHT},
{"sz", "SZ", pr_sz, PIDS_VM_SIZE, 5, HPU, PO|RIGHT},
{"taskid", "TASKID", pr_nop, PIDS_noop, 5, SUN, TO|PIDMAX|RIGHT}, // is this a thread ID?
{"tdev", "TDEV", pr_nop, PIDS_noop, 4, XXX, AN|RIGHT},
{"tgid", "TGID", pr_procs, PIDS_ID_TGID, 5, LNX, PO|PIDMAX|RIGHT},
{"thcount", "THCNT", pr_nlwp, PIDS_NLWP, 5, AIX, PO|RIGHT},
{"tid", "TID", pr_tasks, PIDS_ID_PID, 5, AIX, TO|PIDMAX|RIGHT},
{"time", "TIME", pr_time, PIDS_TIME_ALL, 8, U98, ET|RIGHT}, /*cputime*/ /* was 6 wide */
ps: make those namespaces up to date with linux kernel Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-05-05 10:30:00 +05:30
{"timens", "TIMENS", pr_timens, PIDS_NS_TIME, 10, LNX, ET|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"timeout", "TMOUT", pr_nop, PIDS_noop, 5, LNX, AN|RIGHT}, // 2.0.xx era
ps: add times & cputimes format specifiers: cumulative CPU time in seconds These format specifiers are to time & cputime what etimes is to etime. Signed-off-by: Sébastien Bigaret <sebastien.bigaret@telecom-bretagne.eu> References: procps-ng/procps!43
2017-03-11 12:10:19 +05:30
{"times", "TIME", pr_times, PIDS_TIME_ALL, 8, LNX, ET|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"tmout", "TMOUT", pr_nop, PIDS_noop, 5, LNX, AN|RIGHT}, // 2.0.xx era
{"tname", "TTY", pr_tty8, PIDS_TTY_NAME, 8, DEC, PO|LEFT},
{"tpgid", "TPGID", pr_tpgid, PIDS_ID_TPGID, 5, XXX, PO|PIDMAX|RIGHT},
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"trs", "TRS", pr_trs, PIDS_VSIZE_BYTES, 4, AIX, PO|RIGHT},
{"trss", "TRSS", pr_trs, PIDS_VSIZE_BYTES, 4, BSD, PO|RIGHT}, /* 4.3BSD NET/2 */
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"tsess", "TSESS", pr_nop, PIDS_noop, 5, BSD, PO|PIDMAX|RIGHT},
{"tsession", "TSESS", pr_nop, PIDS_noop, 5, DEC, PO|PIDMAX|RIGHT},
{"tsid", "TSID", pr_nop, PIDS_noop, 5, BSD, PO|PIDMAX|RIGHT},
{"tsig", "PENDING", pr_tsig, PIDS_SIGPENDING, 9, BSD, ET|SIGNAL}, /* Dragonfly used this for thread-specific, and "sig" for whole-proc */
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"tsiz", "TSIZ", pr_tsiz, PIDS_VSIZE_BYTES, 4, BSD, PO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"tt", "TT", pr_tty8, PIDS_TTY_NAME, 8, BSD, PO|LEFT},
{"tty", "TT", pr_tty8, PIDS_TTY_NAME, 8, U98, PO|LEFT}, /* Unix98 requires "TT" but has "TTY" too. :-( */ /* was 3 wide */
{"tty4", "TTY", pr_tty4, PIDS_TTY_NAME, 4, LNX, PO|LEFT},
{"tty8", "TTY", pr_tty8, PIDS_TTY_NAME, 8, LNX, PO|LEFT},
{"u_procp", "UPROCP", pr_nop, PIDS_noop, 6, DEC, AN|RIGHT},
{"ucmd", "CMD", pr_comm, PIDS_CMD, 15, DEC, PO|UNLIMITED}, /*ucomm*/
{"ucomm", "COMMAND", pr_comm, PIDS_CMD, 15, XXX, PO|UNLIMITED}, /*comm*/
{"uid", "UID", pr_euid, PIDS_ID_EUID, 5, XXX, ET|RIGHT},
{"uid_hack", "UID", pr_euser, PIDS_ID_EUSER, 8, XXX, ET|USER},
{"umask", "UMASK", pr_nop, PIDS_noop, 5, DEC, AN|RIGHT},
{"uname", "USER", pr_euser, PIDS_ID_EUSER, 8, DEC, ET|USER}, /* man page misspelling of user? */
{"unit", "UNIT", pr_sd_unit, PIDS_SD_UNIT, 31, LNX, ET|LEFT},
{"upr", "UPR", pr_nop, PIDS_noop, 3, BSD, TO|RIGHT}, /*usrpri*/
{"uprocp", "UPROCP", pr_nop, PIDS_noop, 8, BSD, AN|RIGHT},
{"user", "USER", pr_euser, PIDS_ID_EUSER, 8, U98, ET|USER}, /* BSD n forces this to UID */
{"userns", "USERNS", pr_userns, PIDS_NS_USER, 10, LNX, ET|RIGHT},
{"usertime", "USER", pr_nop, PIDS_noop, 4, DEC, ET|RIGHT},
{"usrpri", "UPR", pr_nop, PIDS_noop, 3, DEC, TO|RIGHT}, /*upr*/
ps: adapt to the newly added library smaps_rollup item In that commit referenced below, a new field was added to the ps program which required adding 2 newlib items together. Such a need is now satisfied by the library. So, this commit will just adapt ps for that provision. Reference(s): commit e782b1d85989a9d27474264d4d65ffe1c485bdc9 Signed-off-by: Jim Warner <james.warner@comcast.net>
2021-06-16 10:30:00 +05:30
{"uss", "USS", pr_uss, PIDS_SMAP_PRV_TOTAL, 5, XXX, PO|RIGHT},
ps: enabled sort with 'utilization' related specifiers When %CUU was added, in the commit referenced below, I stated that 4 similar specifiers already existed. Well I misspoke since there is actually 5 including 'util'. Each of those fields had no sort capability. Since the values are dynamically calculated, they were forced to use 'PIDS_extra' as the format_array 'sr' designation. Now each will use 'PIDS_UTILIZATION' and be sort-able. [ yes, sometimes the calculated values could contain ] [ reaped children while the sort field does not. but ] [ such disparity depends on obscure bsd/gnu options. ] Reference(s): . Mar, 2022 - added %CUU commit 2ac72e2e801e015532b555ae0f2272c8ecef2c8b Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-03-06 11:30:00 +05:30
{"util", "C", pr_c, PIDS_UTILIZATION, 2, SGI, ET|RIGHT}, // not sure about "C"
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"utime", "UTIME", pr_nop, PIDS_TICS_USER, 6, LNx, ET|RIGHT},
{"utsns", "UTSNS", pr_utsns, PIDS_NS_UTS, 10, LNX, ET|RIGHT},
{"uunit", "UUNIT", pr_sd_uunit, PIDS_SD_UUNIT, 31, LNX, ET|LEFT},
{"vm_data", "DATA", pr_nop, PIDS_VM_DATA, 5, LNx, PO|RIGHT},
{"vm_exe", "EXE", pr_nop, PIDS_VM_EXE, 5, LNx, PO|RIGHT},
{"vm_lib", "LIB", pr_nop, PIDS_VM_LIB, 5, LNx, PO|RIGHT},
{"vm_lock", "LCK", pr_nop, PIDS_VM_RSS_LOCKED, 3, LNx, PO|RIGHT},
{"vm_stack", "STACK", pr_nop, PIDS_VM_STACK, 5, LNx, PO|RIGHT},
ps: adapted to change of VSIZE_PGS item to VSIZE_BYTES Signed-off-by: Jim Warner <james.warner@comcast.net>
2022-07-28 10:30:00 +05:30
{"vsize", "VSZ", pr_vsz, PIDS_VSIZE_BYTES, 6, DEC, PO|RIGHT}, /*vsz*/
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"vsz", "VSZ", pr_vsz, PIDS_VM_SIZE, 6, U98, PO|RIGHT}, /*vsize*/
ps: Add IO Accounting fields Add the fields for the IO accounting to ps as the library now has them added from previous commit. References: commit a7afe06e6f1b397b7404fbee724a51f88cc8a59c
2021-04-24 18:43:38 +05:30
{"wbytes", "WBYTES", pr_wbytes, PIDS_IO_WRITE_BYTES, 5, LNX, TO|RIGHT},
{"wcbytes", "WCBYTES", pr_wcbytes, PIDS_IO_WRITE_CBYTES, 5, LNX, TO|RIGHT},
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
{"wchan", "WCHAN", pr_wchan, PIDS_WCHAN_NAME, 6, XXX, TO|WCHAN}, /* BSD n forces this to nwchan */ /* was 10 wide */
ps: Add IO Accounting fields Add the fields for the IO accounting to ps as the library now has them added from previous commit. References: commit a7afe06e6f1b397b7404fbee724a51f88cc8a59c
2021-04-24 18:43:38 +05:30
{"wchars", "WCHARS", pr_wchars, PIDS_IO_WRITE_CHARS, 5, LNX, TO|RIGHT},
related: adapt for changes in result types, <PIDS> api This patch is the response to changes in <pids> types. These additional modifications were also incorporated. . ps ------------------------------------------------- pr_wname was eliminated as it just duplicated pr_wchan pr_wchan referenced WCHAN_ADDR in error, vs WCHAN_NAME pr_nwchan referenced WCHAN_NAME, not proper WCHAN_ADDR Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-31 10:30:00 +05:30
{"wname", "WCHAN", pr_wchan, PIDS_WCHAN_NAME, 6, SGI, TO|WCHAN}, /* opposite of nwchan */
ps: Add IO Accounting fields Add the fields for the IO accounting to ps as the library now has them added from previous commit. References: commit a7afe06e6f1b397b7404fbee724a51f88cc8a59c
2021-04-24 18:43:38 +05:30
{"wops", "WOPS", pr_wops, PIDS_IO_WRITE_OPS, 5, LNX, TO|RIGHT},
related: change for lost 'PROCPS_' enumerator prefixes With this patch we've completed a progression toward a standard approach to naming conventions which follows: * Only functions will begin with that 'procps_' prefix . ........................................... examples . procps_vmstat_get () . procps_diskstats_select () - ---------------------------------------------------- * Exposed structures begin with the module/header name . ........................................... examples . struct pids_info . struct stat_reaped - ---------------------------------------------------- * Item enumerators begin like structs, but capitalized . ........................................... examples . VMSTAT_COMPACT_FAIL . MEMINFO_DELTA_ACTIVE [ slabinfo varies slightly due to some item variants ] . SLABINFO_extra . SLABS_SIZE_ACTIVE . SLABNODE_OBJS_PER_SLAB [ could cure with a prefix of SLABINFO, but too long ] - ---------------------------------------------------- * Other enumerators work exactly like item enumerators . ........................................... examples . PIDS_SORT_ASCEND . STAT_REAP_CPUS_AND_NODES - ---------------------------------------------------- * Macros and constants begin just like the enumerators . ........................................... examples . #define SLABINFO_GET . #define DISKSTATS_TYPE_DISK - ---------------------------------------------------- Signed-off-by: Jim Warner <james.warner@comcast.net>
2016-07-21 10:30:00 +05:30
{"xstat", "XSTAT", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT},
{"zone", "ZONE", pr_context, PIDS_ID_TGID, 31, SUN, ET|LEFT}, // Solaris zone == Linux context?
{"zoneid", "ZONEID", pr_nop, PIDS_noop, 31, SUN, ET|RIGHT}, // Linux only offers context names
{"~", "-", pr_nop, PIDS_noop, 1, LNX, AN|RIGHT} /* NULL would ruin alphabetical order */
procps 010114
2002-02-02 04:17:29 +05:30
};
ugly wart gone
2003-09-28 22:53:29 +05:30
#undef USER
#undef LEFT
#undef RIGHT
#undef UNLIMITED
#undef WCHAN
#undef SIGNAL
#undef PIDMAX
hard disk about to die
2003-09-28 08:15:05 +05:30
#undef PO
#undef TO
#undef AN
#undef ET
procps 010114
2002-02-02 04:17:29 +05:30
static const int format_array_count = sizeof(format_array)/sizeof(format_struct);
/****************************** Macro formats *******************************/
/* First X field may be NR, which is p->start_code>>26 printed with %2ld */
/* That seems useless though, and Debian already killed it. */
/* The ones marked "Digital" have the name defined, not just the data. */
static const macro_struct macro_array[] = {
{"DFMT", "pid,tname,state,cputime,cmd"}, /* Digital's default */
{"DefBSD", "pid,tname,stat,bsdtime,args"}, /* Our BSD default */
{"DefSysV", "pid,tname,time,cmd"}, /* Our SysV default */
{"END_BSD", "state,tname,cputime,comm"}, /* trailer for O */
{"END_SYS5", "state,tname,time,command"}, /* trailer for -O */
{"F5FMT", "uname,pid,ppid,c,start,tname,time,cmd"}, /* Digital -f */
{"FB_", "pid,tt,stat,time,command"}, /* FreeBSD default */
{"FB_j", "user,pid,ppid,pgid,sess,jobc,stat,tt,time,command"}, /* FreeBSD j */
{"FB_l", "uid,pid,ppid,cpu,pri,nice,vsz,rss,wchan,stat,tt,time,command"}, /* FreeBSD l */
{"FB_u", "user,pid,pcpu,pmem,vsz,rss,tt,stat,start,time,command"}, /* FreeBSD u */
{"FB_v", "pid,stat,time,sl,re,pagein,vsz,rss,lim,tsiz,pcpu,pmem,command"}, /* FreeBSD v */
{"FD_", "pid,tty,time,comm"}, /* Fictional Debian SysV default */
{"FD_f", "user,pid,ppid,start_time,tty,time,comm"}, /* Fictional Debian -f */
{"FD_fj", "user,pid,ppid,start_time,tty,time,pgid,sid,comm"}, /* Fictional Debian -jf */
{"FD_j", "pid,tty,time,pgid,sid,comm"}, /* Fictional Debian -j */
{"FD_l", "flags,state,uid,pid,ppid,priority,nice,vsz,wchan,tty,time,comm"}, /* Fictional Debian -l */
{"FD_lj", "flags,state,uid,pid,ppid,priority,nice,vsz,wchan,tty,time,pgid,sid,comm"}, /* Fictional Debian -jl */
{"FL5FMT", "f,state,uid,pid,ppid,pcpu,pri,nice,rss,wchan,start,time,command"}, /* Digital -fl */
NSA SELinux for Linux 2.6.xx
2003-12-24 09:48:24 +05:30
{"FLASK_context", "pid,context,command"}, /* Flask Linux context, --context */
added SELINUX patches
2002-09-27 19:18:00 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
{"HP_", "pid,tty,time,comm"}, /* HP default */
{"HP_f", "user,pid,ppid,cpu,stime,tty,time,args"}, /* HP -f */
{"HP_fl", "flags,state,user,pid,ppid,cpu,intpri,nice,addr,sz,wchan,stime,tty,time,args"}, /* HP -fl */
{"HP_l", "flags,state,uid,pid,ppid,cpu,intpri,nice,addr,sz,wchan,tty,time,comm"}, /* HP -l */
{"J390", "pid,sid,pgrp,tname,atime,args"}, /* OS/390 -j */
{"JFMT", "user,pid,ppid,pgid,sess,jobc,state,tname,cputime,command"}, /* Digital j and -j */
{"L5FMT", "f,state,uid,pid,ppid,c,pri,nice,addr,sz,wchan,tt,time,ucmd"}, /* Digital -l */
{"LFMT", "uid,pid,ppid,cp,pri,nice,vsz,rss,wchan,state,tname,cputime,command"}, /* Digital l */
{"OL_X", "pid,start_stack,esp,eip,timeout,alarm,stat,tname,bsdtime,args"}, /* Old i386 Linux X */
{"OL_j", "ppid,pid,pgid,sid,tname,tpgid,stat,uid,bsdtime,args"}, /* Old Linux j */
{"OL_l", "flags,uid,pid,ppid,priority,nice,vsz,rss,wchan,stat,tname,bsdtime,args"}, /* Old Linux l */
{"OL_m", "pid,tname,majflt,minflt,m_trs,m_drs,m_size,m_swap,rss,m_share,vm_lib,m_dt,args"}, /* Old Linux m */
{"OL_s", "uid,pid,pending,sig_block,sig_ignore,caught,stat,tname,bsdtime,args"}, /* Old Linux s */
{"OL_u", "user,pid,pcpu,pmem,vsz,rss,tname,stat,start_time,bsdtime,args"}, /* Old Linux u */
{"OL_v", "pid,tname,stat,bsdtime,maj_flt,m_trs,m_drs,rss,pmem,args"}, /* Old Linux v */
{"RD_", "pid,tname,state,bsdtime,comm"}, /* Real Debian default */
{"RD_f", "uid,pid,ppid,start_time,tname,bsdtime,args"}, /* Real Debian -f */
{"RD_fj", "uid,pid,ppid,start_time,tname,bsdtime,pgid,sid,args"}, /* Real Debian -jf */
{"RD_j", "pid,tname,state,bsdtime,pgid,sid,comm"}, /* Real Debian -j */
{"RD_l", "flags,state,uid,pid,ppid,priority,nice,wchan,tname,bsdtime,comm"}, /* Real Debian -l */
{"RD_lj", "flags,state,uid,pid,ppid,priority,nice,wchan,tname,bsdtime,pgid,sid,comm"}, /* Real Debian -jl */
{"RUSAGE", "minflt,majflt,nswap,inblock,oublock,msgsnd,msgrcv,nsigs,nvcsw,nivcsw"}, /* Digital -o "RUSAGE" */
{"SCHED", "user,pcpu,pri,usrpri,nice,psxpri,psr,policy,pset"}, /* Digital -o "SCHED" */
{"SFMT", "uid,pid,cursig,sig,sigmask,sigignore,sigcatch,stat,tname,command"}, /* Digital s */
{"Std_f", "uid_hack,pid,ppid,c,stime,tname,time,cmd"}, /* new -f */
{"Std_fl", "f,s,uid_hack,pid,ppid,c,opri,ni,addr,sz,wchan,stime,tname,time,cmd"}, /* -fl */
{"Std_l", "f,s,uid,pid,ppid,c,opri,ni,addr,sz,wchan,tname,time,ucmd"}, /* new -l */
{"THREAD", "user,pcpu,pri,scnt,wchan,usertime,systime"}, /* Digital -o "THREAD" */
{"UFMT", "uname,pid,pcpu,pmem,vsz,rss,tt,state,start,time,command"}, /* Digital u */
{"VFMT", "pid,tt,state,time,sl,pagein,vsz,rss,pcpu,pmem,command"}, /* Digital v */
{"~", "~"} /* NULL would ruin alphabetical order */
};
static const int macro_array_count = sizeof(macro_array)/sizeof(macro_struct);
/*************************** AIX formats ********************/
/* Convert AIX format codes to normal format specifiers. */
static const aix_struct aix_array[] = {
{'C', "pcpu", "%CPU"},
{'G', "group", "GROUP"},
{'P', "ppid", "PPID"},
{'U', "user", "USER"},
{'a', "args", "COMMAND"},
{'c', "comm", "COMMAND"},
{'g', "rgroup", "RGROUP"},
{'n', "nice", "NI"},
{'p', "pid", "PID"},
{'r', "pgid", "PGID"},
{'t', "etime", "ELAPSED"},
{'u', "ruser", "RUSER"},
{'x', "time", "TIME"},
{'y', "tty", "TTY"},
{'z', "vsz", "VSZ"},
{'~', "~", "~"} /* NULL would ruin alphabetical order */
};
/********************* sorting ***************************/
/* Convert short sorting codes to normal format specifiers. */
static const shortsort_struct shortsort_array[] = {
{'C', "pcpu" },
{'G', "tpgid" },
{'J', "cstime" },
/* {'K', "stime" }, */ /* conflict, system vs. start time */
{'M', "maj_flt" },
{'N', "cmaj_flt" },
{'P', "ppid" },
{'R', "resident" },
{'S', "share" },
{'T', "start_time" },
{'U', "uid" }, /* euid */
{'c', "cmd" },
{'f', "flags" },
{'g', "pgrp" },
{'j', "cutime" },
{'k', "utime" },
{'m', "min_flt" },
{'n', "cmin_flt" },
{'o', "session" },
{'p', "pid" },
{'r', "rss" },
{'s', "size" },
{'t', "tty" },
{'u', "user" },
{'v', "vsize" },
{'y', "priority" }, /* nice */
{'~', "~" } /* NULL would ruin alphabetical order */
};
/*********** print format_array **********/
/* called by the parser in another file */
void print_format_specifiers(void){
const format_struct *walk = format_array;
while(*(walk->spec) != '~'){
if(walk->pr != pr_nop) printf("%-12.12s %-8.8s\n", walk->spec, walk->head);
walk++;
}
}
/************ comparison functions for bsearch *************/
static int compare_format_structs(const void *a, const void *b){
gcc 3.0 warnings
2002-10-12 09:55:57 +05:30
return strcmp(((const format_struct*)a)->spec,((const format_struct*)b)->spec);
procps 010114
2002-02-02 04:17:29 +05:30
}
static int compare_macro_structs(const void *a, const void *b){
gcc 3.0 warnings
2002-10-12 09:55:57 +05:30
return strcmp(((const macro_struct*)a)->spec,((const macro_struct*)b)->spec);
procps 010114
2002-02-02 04:17:29 +05:30
}
/******** look up structs as needed by the sort & format parsers ******/
const shortsort_struct *search_shortsort_array(const int findme){
const shortsort_struct *walk = shortsort_array;
while(walk->desc != '~'){
if(walk->desc == findme) return walk;
walk++;
}
return NULL;
}
const aix_struct *search_aix_array(const int findme){
const aix_struct *walk = aix_array;
while(walk->desc != '~'){
if(walk->desc == findme) return walk;
walk++;
}
return NULL;
}
const format_struct *search_format_array(const char *findme){
format_struct key;
key.spec = findme;
return bsearch(&key, format_array, format_array_count,
sizeof(format_struct), compare_format_structs
);
}
const macro_struct *search_macro_array(const char *findme){
macro_struct key;
key.spec = findme;
return bsearch(&key, macro_array, macro_array_count,
sizeof(macro_struct), compare_macro_structs
);
}
static unsigned int active_cols; /* some multiple of screen_cols */
/***** Last chance, avoid needless trunctuation. */
static void check_header_width(void){
format_node *walk = format_list;
unsigned int total = 0;
int was_normal = 0;
unsigned int i = 0;
unsigned int sigs = 0;
while(walk){
ugly wart gone
2003-09-28 22:53:29 +05:30
switch((walk->flags) & CF_JUST_MASK){
procps 010114
2002-02-02 04:17:29 +05:30
default:
total += walk->width;
total += was_normal;
was_normal = 1;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_SIGNAL:
procps 010114
2002-02-02 04:17:29 +05:30
sigs++;
total += walk->width;
total += was_normal;
was_normal = 1;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_UNLIMITED: /* could chop this a bit */
procps 010114
2002-02-02 04:17:29 +05:30
if(walk->next) total += walk->width;
else total += 3; /* not strlen(walk->name) */
total += was_normal;
was_normal = 1;
break;
case 0: /* AIX */
total += walk->width;
was_normal = 0;
break;
}
walk = walk->next;
}
for(;;){
i++;
active_cols = screen_cols * i;
if(active_cols>=total) break;
if(screen_cols*i >= OUTBUF_SIZE/2) break; /* can't go over */
}
wide_signals = (total+sigs*7 <= active_cols);
}
/********** show one process (NULL proc prints header) **********/
c99 for ps
2002-11-27 15:22:19 +05:30
SPACE_AMOUNT
2002-12-04 04:23:45 +05:30
//#define SPACE_AMOUNT page_size
GPLONLY_ and PID-related stuff
2003-07-03 10:50:19 +05:30
#define SPACE_AMOUNT 144
SPACE_AMOUNT
2002-12-04 04:23:45 +05:30
c99 for ps
2002-11-27 15:22:19 +05:30
static char *saved_outbuf;
ugly wart gone
2003-09-28 22:53:29 +05:30
void show_one_proc(const proc_t *restrict const p, const format_node *restrict fmt){
procps 010114
2002-02-02 04:17:29 +05:30
/* unknown: maybe set correct & actual to 1, remove +/- 1 below */
int correct = 0; /* screen position we should be at */
int actual = 0; /* screen position we are at */
int amount = 0; /* amount of text that this data is */
int leftpad = 0; /* amount of space this column _could_ need */
int space = 0; /* amount of space we actually need to print */
int dospace = 0; /* previous column determined that we need a space */
int legit = 0; /* legitimately stolen extra space */
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
int sz = 0; /* real size of data in outbuffer */
int tmpspace = 0;
c99 for ps
2002-11-27 15:22:19 +05:30
char *restrict const outbuf = saved_outbuf;
procps 010114
2002-02-02 04:17:29 +05:30
static int did_stuff = 0; /* have we ever printed anything? */
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(-1==(long)p){ /* true only once, at the end */
procps 010114
2002-02-02 04:17:29 +05:30
if(did_stuff) return;
/* have _never_ printed anything, but might need a header */
if(!--lines_to_next_header){
lines_to_next_header = header_gap;
ugly wart gone
2003-09-28 22:53:29 +05:30
show_one_proc(NULL,fmt);
procps 010114
2002-02-02 04:17:29 +05:30
}
/* fprintf(stderr, "No processes available.\n"); */ /* legal? */
exit(1);
}
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(p){ /* not header, maybe we should call ourselves for it */
if(!--lines_to_next_header){
procps 010114
2002-02-02 04:17:29 +05:30
lines_to_next_header = header_gap;
ugly wart gone
2003-09-28 22:53:29 +05:30
show_one_proc(NULL,fmt);
procps 010114
2002-02-02 04:17:29 +05:30
}
}
did_stuff = 1;
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(active_cols>(int)OUTBUF_SIZE) fprintf(stderr,_("fix bigness error\n"));
procps 010114
2002-02-02 04:17:29 +05:30
/* print row start sequence */
for(;;){
legit = 0;
/* set width suggestion which might be ignored */
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
// if(likely(fmt->next)) max_rightward = fmt->width;
// else max_rightward = active_cols-((correct>actual) ? correct : actual);
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(fmt->next){
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
max_rightward = fmt->width;
tmpspace = 0;
}else{
tmpspace = correct-actual;
if (tmpspace<1){
tmpspace = dospace;
max_rightward = active_cols-actual-tmpspace;
}else{
max_rightward = active_cols - ( (correct>actual) ? correct : actual );
}
}
0059-ps/output.c: Enforce a safe range for max_rightward. Enforce a maximum max_rightward of OUTBUF_SIZE-1, because it is used in constructs such as "snprintf(outbuf, max_rightward+1," (we could remove the extra check at the beginning of forest_helper() now, but we decided to leave it, as a precaution and reminder). The minimum max_rightward check is not strictly needed, because it is unsigned. However, we decided to add it anyway: - most of the other variables are signed; - make it visually clear that this case is properly handled; - ideally, the minimum max_rightward should be 1, not 0 (to prevent integer overflows such as "max_rightward-1"), but this might change the behavior/output of ps, so we decided against it, for now. Instead, we fixed the only function that overflows if max_rightward is 0. Also, enforce the same safe range for max_leftward, although it is never used throughout the code-base. ---------------------------- adapted for newlib branch . adapted via 'patch' without rejections Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if(max_rightward <= 0) max_rightward = 0;
else if(max_rightward >= OUTBUF_SIZE) max_rightward = OUTBUF_SIZE-1;
procps 010114
2002-02-02 04:17:29 +05:30
max_leftward = fmt->width + actual - correct; /* TODO check this */
0059-ps/output.c: Enforce a safe range for max_rightward. Enforce a maximum max_rightward of OUTBUF_SIZE-1, because it is used in constructs such as "snprintf(outbuf, max_rightward+1," (we could remove the extra check at the beginning of forest_helper() now, but we decided to leave it, as a precaution and reminder). The minimum max_rightward check is not strictly needed, because it is unsigned. However, we decided to add it anyway: - most of the other variables are signed; - make it visually clear that this case is properly handled; - ideally, the minimum max_rightward should be 1, not 0 (to prevent integer overflows such as "max_rightward-1"), but this might change the behavior/output of ps, so we decided against it, for now. Instead, we fixed the only function that overflows if max_rightward is 0. Also, enforce the same safe range for max_leftward, although it is never used throughout the code-base. ---------------------------- adapted for newlib branch . adapted via 'patch' without rejections Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if(max_leftward <= 0) max_leftward = 0;
else if(max_leftward >= OUTBUF_SIZE) max_leftward = OUTBUF_SIZE-1;
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
// fprintf(stderr, "cols: %d, max_rightward: %d, max_leftward: %d, actual: %d, correct: %d\n",
// active_cols, max_rightward, max_leftward, actual, correct);
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
/* prepare data and calculate leftpad */
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(p && fmt->pr) amount = (*fmt->pr)(outbuf,p);
0058-ps/output.c: Replace strcpy() with snprintf() in show_one_proc(). This strcpy() should normally not overflow outbuf, but names can be overridden (via -o). Also, check "amount" in all cases. ---------------------------- adapted for newlib branch . we don't use that 'likely/unlikely' crap in newlib Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
else amount = snprintf(outbuf, OUTBUF_SIZE, "%s", fmt->name); /* AIX or headers */
if(amount < 0) outbuf[amount = 0] = '\0';
else if(amount >= OUTBUF_SIZE) outbuf[amount = OUTBUF_SIZE-1] = '\0';
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
ugly wart gone
2003-09-28 22:53:29 +05:30
switch((fmt->flags) & CF_JUST_MASK){
procps 010114
2002-02-02 04:17:29 +05:30
case 0: /* for AIX, assigned outside this file */
leftpad = 0;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_LEFT: /* bad */
procps 010114
2002-02-02 04:17:29 +05:30
leftpad = 0;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_RIGHT: /* OK */
procps 010114
2002-02-02 04:17:29 +05:30
leftpad = fmt->width - amount;
if(leftpad < 0) leftpad = 0;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_SIGNAL:
procps 010114
2002-02-02 04:17:29 +05:30
/* if the screen is wide enough, use full 16-character output */
if(wide_signals){
leftpad = 16 - amount;
legit = 7;
}else{
leftpad = 9 - amount;
}
if(leftpad < 0) leftpad = 0;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_USER: /* bad */
procps 010114
2002-02-02 04:17:29 +05:30
leftpad = fmt->width - amount;
if(leftpad < 0) leftpad = 0;
if(!user_is_number) leftpad = 0;
break;
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_WCHAN: /* bad */
procps 010114
2002-02-02 04:17:29 +05:30
if(wchan_is_number){
leftpad = fmt->width - amount;
if(leftpad < 0) leftpad = 0;
break;
}else{
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
if ((active_cols-actual-tmpspace)<1)
outbuf[1] = '\0'; /* oops, we (mostly) lose this column... */
procps 010114
2002-02-02 04:17:29 +05:30
leftpad = 0;
break;
}
ugly wart gone
2003-09-28 22:53:29 +05:30
case CF_UNLIMITED:
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
{
if(active_cols-actual-tmpspace < 1)
outbuf[1] = '\0'; /* oops, we (mostly) lose this column... */
procps 010114
2002-02-02 04:17:29 +05:30
leftpad = 0;
break;
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
}
procps 010114
2002-02-02 04:17:29 +05:30
default:
ps: add gettext support Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-09 17:22:57 +05:30
fprintf(stderr, _("bad alignment code\n"));
procps 010114
2002-02-02 04:17:29 +05:30
break;
}
/* At this point:
*
* correct from previous column
* actual from previous column
* amount not needed (garbage due to chopping)
* leftpad left padding for this column alone (not make-up or gap)
* space not needed (will recalculate now)
* dospace if we require space between this and the prior column
* legit space we were allowed to steal, and thus did steal
*/
space = correct - actual + leftpad;
if(space<1) space=dospace;
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(space>SPACE_AMOUNT) space=SPACE_AMOUNT; // only so much available
procps 010114
2002-02-02 04:17:29 +05:30
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
/* real size -- don't forget in 'amount' is number of cells */
0061-ps/output.c: Always null-terminate outbuf in show_one_proc(). Before "strlen(outbuf)", if one of the pr_*() functions forgot to do it. This prevents an out-of-bounds read in strlen(), and an out-of-bounds write in "outbuf[sz] = '\n'". Another solution would be to replace strlen() with strnlen(), but this is not used anywhere else in the code-base and may not exist in all libc's. ---------------------------- adapted for newlib branch . adapted via 'patch' without rejections Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
outbuf[OUTBUF_SIZE-1] = '\0';
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
sz = strlen(outbuf);
supgid/supgrp support, improved library interface Library changes readproc . added support for supplementary groups . eliminated 2 potential mem leak sources . shortcut used for multi-threaded str vectors & ptrs was obsoleted . freeing of proc_t related dynamic memory now rests with the library . standardized/normalized many c comments sysinfo . corrected note regarding glibc & cpuinfo library.map . made the visible freeproc accessable Program changes pmap . initialized buffer for new readproc i/f . eliminated now obsolete free() call ps . added width aware supgrp support . initialized buffers for new readproc i/f . eliminated now obsolete free() calls top . added supgrp support as variable width . eliminated now obsolete free() calls . expoilted library freeproc function . corrected -h|v args text & spacing . updated some c comments Documentation changes ps.1 . added supgid and supgrp top.1 . added supgid and supgrp . addition of above required renumbering many fields in section 3a. DESCRIPTIONS
2011-08-01 16:58:46 +05:30
procps 010114
2002-02-02 04:17:29 +05:30
/* print data, set x position stuff */
library: cleanup of library includes The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
2016-04-16 12:33:57 +05:30
if(!fmt->next){
procps 010114
2002-02-02 04:17:29 +05:30
/* Last column. Write padding + data + newline all together. */
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
outbuf[sz] = '\n';
fwrite(outbuf-space, space+sz+1, 1, stdout);
procps 010114
2002-02-02 04:17:29 +05:30
break;
}
/* Not the last column. Write padding + data together. */
leftovers in the 3.2.4 release
2004-11-05 02:20:59 +05:30
fwrite(outbuf-space, space+sz, 1, stdout);
procps 010114
2002-02-02 04:17:29 +05:30
actual += space+amount;
correct += fmt->width;
correct += legit; /* adjust for SIGNAL expansion */
if(fmt->pr && fmt->next->pr){ /* neither is AIX filler */
correct++;
dospace = 1;
}else{
dospace = 0;
}
fmt = fmt->next;
/* At this point:
*
* correct screen position we should be at
* actual screen position we are at
* amount not needed
* leftpad not needed
* space not needed
* dospace if have determined that we need a space next time
* legit not needed
*/
}
}
Jim needs restrictions
2002-11-27 05:54:01 +05:30
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
void init_output(void)
{
int outbuf_pages;
char *outbuf;
Jim needs restrictions
2002-11-27 05:54:01 +05:30
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
// add page_size-1 to round up
outbuf_pages = (OUTBUF_SIZE+SPACE_AMOUNT+page_size-1)/page_size;
outbuf = mmap(
0,
page_size * (outbuf_pages+1), // 1 more, for guard page at high addresses
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS,
-1,
0);
0056-ps/output.c: Check return value of mmap() in init_output(). We decided not to check the return value of the mprotect() calls, because they are not vital to the operation of ps. ---------------------------- adapted for newlib branch . many formatting/whitespace differences Signed-off-by: Jim Warner <james.warner@comcast.net>
1970-01-01 05:30:00 +05:30
if(outbuf == MAP_FAILED)
catastrophic_failure(__FILE__, __LINE__, _("please report this bug"));
library: more mem and stat fixes Make distcheck now succeeds. Changed some of the binaries to use the new API.
2015-06-24 17:46:16 +05:30
memset(outbuf, ' ', SPACE_AMOUNT);
if(SPACE_AMOUNT==page_size)
mprotect(outbuf, page_size, PROT_READ);
mprotect(outbuf + page_size*outbuf_pages, page_size, PROT_NONE); // guard page
saved_outbuf = outbuf + SPACE_AMOUNT;
// available space: page_size*outbuf_pages-SPACE_AMOUNT
seconds_since_1970 = time(NULL);
check_header_width();
procps 010114
2002-02-02 04:17:29 +05:30
}