emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: add <pids> TIME_ALL/TIME_ELAPSED needed by ps

Browse Source 
Shoot, here's yet another bow to ps needs. But it's ok
because it makes a lot of sense. Rather than force all
users into their own calculations do but it once here.

As an aside this need arose during ps testing when the
sorts were using TIME_START or TICS_ALL. That was just
fine for almost every need except 'etime' plus 'time'.

That 'etime' was sorting the opposite of what's wanted
when using TIME_START (of course) while 'time' yielded
some weird ordering because TICS_ALL was too granular.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2015-09-30 00:00:00 -05:00 committed by Craig Small
parent 042cfa71e7
commit 30997b967a
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proc/pids.c
View File

@ -36,6 +36,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <proc/pids.h> #include <proc/pids.h>
#include <proc/sysinfo.h>
#include <proc/uptime.h>
#include "procps-private.h" #include "procps-private.h"
#include "devname.h" // and a few headers for our #include "devname.h" // and a few headers for our
@ -81,6 +83,8 @@ struct procps_pidsinfo {
PROCTAB *PT; // the old library essential interface PROCTAB *PT; // the old library essential interface
struct pids_counts counts; // counts for 'procps_pids_stacks_fill' struct pids_counts counts; // counts for 'procps_pids_stacks_fill'
struct pids_reap reaped; // counts + stacks for 'procps_pids_reap' struct pids_reap reaped; // counts + stacks for 'procps_pids_reap'
unsigned long hertz; // for TIME_ALL & TIME_ELAPSED calculations
unsigned long long boot_seconds; // for TIME_ELAPSED calculation
}; };
@ -207,6 +211,9 @@ REG_set(TICS_SYSTEM, ull_int, stime)
REG_set(TICS_SYSTEM_C, ull_int, cstime) REG_set(TICS_SYSTEM_C, ull_int, cstime)
REG_set(TICS_USER, ull_int, utime) REG_set(TICS_USER, ull_int, utime)
REG_set(TICS_USER_C, ull_int, cutime) REG_set(TICS_USER_C, ull_int, cutime)
setDECL(TIME_ALL) { R->result.ull_int = (P->utime + P->stime) / I->hertz; }
setDECL(TIME_ELAPSED) { R->result.ull_int = (I->boot_seconds >= (P->start_time / I->hertz)) ? I->boot_seconds - (P->start_time / I->hertz) : 0; }
REG_set(TIME_START, ull_int, start_time) REG_set(TIME_START, ull_int, start_time)
REG_set(TTY, s_int, tty) REG_set(TTY, s_int, tty)
setDECL(TTY_NAME) { char buf[64]; (void)I; dev_to_tty(buf, sizeof(buf), P->tty, P->tid, ABBREV_DEV); R->result.str = strdup(buf); } setDECL(TTY_NAME) { char buf[64]; (void)I; dev_to_tty(buf, sizeof(buf), P->tty, P->tid, ABBREV_DEV); R->result.str = strdup(buf); }
@ -454,6 +461,8 @@ static struct {
{ RS(TICS_SYSTEM_C), f_stat, NULL, QS(ull_int), 0 }, { RS(TICS_SYSTEM_C), f_stat, NULL, QS(ull_int), 0 },
{ RS(TICS_USER), f_stat, NULL, QS(ull_int), 0 }, { RS(TICS_USER), f_stat, NULL, QS(ull_int), 0 },
{ RS(TICS_USER_C), f_stat, NULL, QS(ull_int), 0 }, { RS(TICS_USER_C), f_stat, NULL, QS(ull_int), 0 },
{ RS(TIME_ALL), f_stat, NULL, QS(ull_int), 0 },
{ RS(TIME_ELAPSED), f_stat, NULL, QS(ull_int), 0 },
{ RS(TIME_START), f_stat, NULL, QS(ull_int), 0 }, { RS(TIME_START), f_stat, NULL, QS(ull_int), 0 },
{ RS(TTY), f_stat, NULL, QS(s_int), 0 }, { RS(TTY), f_stat, NULL, QS(s_int), 0 },
{ RS(TTY_NAME), f_stat, FF(str), QS(strvers), 0 }, { RS(TTY_NAME), f_stat, FF(str), QS(strvers), 0 },
@ -1011,6 +1020,7 @@ PROCPS_EXPORT int procps_pids_new (
enum pids_item *items) enum pids_item *items)
{ {
struct procps_pidsinfo *p; struct procps_pidsinfo *p;
double uptime_secs;
int pgsz; int pgsz;
if (info == NULL || *info != NULL) if (info == NULL || *info != NULL)
@ -1041,6 +1051,10 @@ PROCPS_EXPORT int procps_pids_new (
config_history(p); config_history(p);
p->hertz = procps_hertz_get();
procps_uptime(&uptime_secs, NULL);
p->boot_seconds = (unsigned long)uptime_secs;
p->refcount = 1; p->refcount = 1;
*info = p; *info = p;
return 0; return 0;

2
proc/pids.h
View File

@ -120,6 +120,8 @@ enum pids_item {
PROCPS_PIDS_TICS_SYSTEM_C, // ull_int PROCPS_PIDS_TICS_SYSTEM_C, // ull_int
PROCPS_PIDS_TICS_USER, // ull_int PROCPS_PIDS_TICS_USER, // ull_int
PROCPS_PIDS_TICS_USER_C, // ull_int PROCPS_PIDS_TICS_USER_C, // ull_int
PROCPS_PIDS_TIME_ALL, // ull_int
PROCPS_PIDS_TIME_ELAPSED, // ull_int
PROCPS_PIDS_TIME_START, // ull_int PROCPS_PIDS_TIME_START, // ull_int
PROCPS_PIDS_TTY, // s_int PROCPS_PIDS_TTY, // s_int
PROCPS_PIDS_TTY_NAME, // str PROCPS_PIDS_TTY_NAME, // str