From 41b9e62be77e5efdb0e9ee06012ff77b65b38869 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 9 Nov 2018 22:03:17 +0000 Subject: [PATCH 1/3] pgrep.c: change to allow 'older than' style selection pgrep.1: man page addition for above selection Makefile.am: addition of global.c to include sections since boot in pgrep. --- Makefile.am | 4 ++-- pgrep.1 | 3 +++ pgrep.c | 24 +++++++++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 01342426..956f8a36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -189,8 +189,8 @@ else endif free_SOURCES = free.c lib/strutils.c lib/fileutils.c -pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c -pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c +pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c ps/global.c +pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c ps/global.c pmap_SOURCES = pmap.c lib/fileutils.c if !CYGWIN pwdx_SOURCES = pwdx.c lib/fileutils.c diff --git a/pgrep.1 b/pgrep.1 index 98915f18..4549245b 100644 --- a/pgrep.1 +++ b/pgrep.1 @@ -100,6 +100,9 @@ Select only the newest (most recently started) of the matching processes. \fB\-o\fR, \fB\-\-oldest\fR Select only the oldest (least recently started) of the matching processes. .TP +\fB\-O\fR, \fB\-\-older\fR \fIsecs\fP +Select processes older than secs. +.TP \fB\-P\fR, \fB\-\-parent\fR \fIppid\fP,... Only match processes whose parent process ID is listed. .TP diff --git a/pgrep.c b/pgrep.c index c73b1b46..64e75b41 100644 --- a/pgrep.c +++ b/pgrep.c @@ -36,6 +36,7 @@ #include #include #include +#include /* EXIT_SUCCESS is 0 */ /* EXIT_FAILURE is 1 */ @@ -52,6 +53,7 @@ #include "proc/sig.h" #include "proc/devname.h" #include "proc/sysinfo.h" +#include "ps/common.h" #define grow_size(x) do { \ if ((x) < 0 || (size_t)(x) >= INT_MAX / 5 / sizeof(struct el)) \ @@ -72,6 +74,7 @@ static int opt_full = 0; static int opt_long = 0; static int opt_longlong = 0; static int opt_oldest = 0; +static int opt_older = 0; static int opt_newest = 0; static int opt_negate = 0; static int opt_exact = 0; @@ -129,6 +132,7 @@ static int __attribute__ ((__noreturn__)) usage(int opt) fputs(_(" -i, --ignore-case match case insensitively\n"), fp); fputs(_(" -n, --newest select most recently started\n"), fp); fputs(_(" -o, --oldest select least recently started\n"), fp); + fputs(_(" -O, --older select where older than seconds\n"), fp); fputs(_(" -P, --parent match only child processes of the given parent\n"), fp); fputs(_(" -s, --session match session IDs\n"), fp); fputs(_(" -t, --terminal match by controlling terminal\n"), fp); @@ -438,7 +442,7 @@ static PROCTAB *do_openproc (void) flags |= PROC_FILLCOM; if (opt_ruid || opt_rgid) flags |= PROC_FILLSTATUS; - if (opt_oldest || opt_newest || opt_pgrp || opt_sid || opt_term) + if (opt_oldest || opt_newest || opt_pgrp || opt_sid || opt_term || opt_older) flags |= PROC_FILLSTAT; if (!(flags & PROC_FILLSTAT)) flags |= PROC_FILLSTATUS; /* FIXME: need one, and PROC_FILLANY broken */ @@ -526,15 +530,18 @@ static struct el * select_procs (int *num) char *cmdsearch = xmalloc(cmdlen); char *cmdoutput = xmalloc(cmdlen); proc_t ns_task; + time_t now; ptp = do_openproc(); preg = do_regcomp(); + now = time(NULL); if (opt_newest) saved_start_time = 0ULL; else saved_start_time = ~0ULL; if (opt_newest) saved_pid = 0; if (opt_oldest) saved_pid = INT_MAX; + if (opt_older) reset_global(); if (opt_ns_pid && ns_read(opt_ns_pid, &ns_task)) { fputs(_("Error reading reference namespace information\n"), stderr); @@ -579,6 +586,8 @@ static struct el * select_procs (int *num) match = match_strlist (tty, opt_term); } } + else if (opt_older) + if(now - seconds_since_boot + (task.start_time / Hertz) + opt_older > now) match = 0; else if (opt_runstates) { match = 0; if (strchr(opt_runstates, task.state)) match = 1; @@ -615,6 +624,7 @@ static struct el * select_procs (int *num) cmdoutput[cmdlen - 1] = '\0'; } + if (match && opt_pattern) { if (opt_full && task.cmdline) strncpy (cmdsearch, cmdline, cmdlen - 1); @@ -662,7 +672,7 @@ static struct el * select_procs (int *num) // control is free if (opt_threads && !i_am_pkill) { while (readtask(ptp, &task, &subtask)){ - // don't add redundand tasks + // don't add redundant tasks if (task.XXXID == subtask.XXXID) continue; @@ -732,6 +742,7 @@ static void parse_opts (int argc, char **argv) {"ignore-case", no_argument, NULL, 'i'}, {"newest", no_argument, NULL, 'n'}, {"oldest", no_argument, NULL, 'o'}, + {"older", required_argument, NULL, 'O'}, {"parent", required_argument, NULL, 'P'}, {"session", required_argument, NULL, 's'}, {"terminal", required_argument, NULL, 't'}, @@ -765,7 +776,7 @@ static void parse_opts (int argc, char **argv) strcat (opts, "lad:vw"); } - strcat (opts, "LF:cfinoxP:g:s:u:U:G:t:r:?Vh"); + strcat (opts, "LF:cfinoxP:O:g:s:u:U:G:t:r:?Vh"); while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != -1) { switch (opt) { @@ -861,6 +872,9 @@ static void parse_opts (int argc, char **argv) opt_oldest = 1; ++criteria_count; break; + case 'O': + opt_older = atoi (optarg); + break; case 's': /* Solaris: match by session ID -- zero means self */ opt_sid = split_list (optarg, conv_sid); if (opt_sid == NULL) @@ -971,7 +985,7 @@ int main (int argc, char **argv) procs = select_procs (&num); if (i_am_pkill) { int i; - int kill_count = 0; + int kill_count = 0; for (i = 0; i < num; i++) { if (execute_kill (procs[i].num, opt_signal) != -1) { if (opt_echo) @@ -986,7 +1000,7 @@ int main (int argc, char **argv) } if (opt_count) fprintf(stdout, "%d\n", num); - return !kill_count; + return !kill_count; } else { if (opt_count) { fprintf(stdout, "%d\n", num); From 79a4eb61280e48ccf52561b33eb38ba9246bc9d6 Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 21 Mar 2019 20:21:09 +0000 Subject: [PATCH 2/3] pgrep.c: Replacing seconds_since_boot with uptime as suggested by Craig Small --- Makefile.am | 4 ++-- pgrep.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 956f8a36..01342426 100644 --- a/Makefile.am +++ b/Makefile.am @@ -189,8 +189,8 @@ else endif free_SOURCES = free.c lib/strutils.c lib/fileutils.c -pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c ps/global.c -pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c ps/global.c +pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c +pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c pmap_SOURCES = pmap.c lib/fileutils.c if !CYGWIN pwdx_SOURCES = pwdx.c lib/fileutils.c diff --git a/pgrep.c b/pgrep.c index 64e75b41..1e08992b 100644 --- a/pgrep.c +++ b/pgrep.c @@ -53,7 +53,6 @@ #include "proc/sig.h" #include "proc/devname.h" #include "proc/sysinfo.h" -#include "ps/common.h" #define grow_size(x) do { \ if ((x) < 0 || (size_t)(x) >= INT_MAX / 5 / sizeof(struct el)) \ @@ -531,17 +530,21 @@ static struct el * select_procs (int *num) char *cmdoutput = xmalloc(cmdlen); proc_t ns_task; time_t now; + double uptime_secs, idle_secs; + ptp = do_openproc(); preg = do_regcomp(); now = time(NULL); + if (uptime(&uptime_secs, &idle_secs) == 0) + xerrx(EXIT_FAILURE, "uptime"); + if (opt_newest) saved_start_time = 0ULL; else saved_start_time = ~0ULL; if (opt_newest) saved_pid = 0; if (opt_oldest) saved_pid = INT_MAX; - if (opt_older) reset_global(); if (opt_ns_pid && ns_read(opt_ns_pid, &ns_task)) { fputs(_("Error reading reference namespace information\n"), stderr); @@ -551,7 +554,6 @@ static struct el * select_procs (int *num) memset(&task, 0, sizeof (task)); memset(&subtask, 0, sizeof (subtask)); while(readproc(ptp, &task)) { - /* printf( "Process state %c\n", task.state ); */ int match = 1; if (task.XXXID == myself) @@ -587,7 +589,7 @@ static struct el * select_procs (int *num) } } else if (opt_older) - if(now - seconds_since_boot + (task.start_time / Hertz) + opt_older > now) match = 0; + if(now - uptime_secs + (task.start_time / Hertz) + opt_older > now) match = 0; else if (opt_runstates) { match = 0; if (strchr(opt_runstates, task.state)) match = 1; From 9975595b9bf1a1130a367598bff61c625f640614 Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 21 Mar 2019 21:32:22 +0000 Subject: [PATCH 3/3] pgrep.c: simplifying uptime call --- pgrep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pgrep.c b/pgrep.c index 1e08992b..58a8842b 100644 --- a/pgrep.c +++ b/pgrep.c @@ -530,14 +530,14 @@ static struct el * select_procs (int *num) char *cmdoutput = xmalloc(cmdlen); proc_t ns_task; time_t now; - double uptime_secs, idle_secs; + int uptime_secs; ptp = do_openproc(); preg = do_regcomp(); now = time(NULL); - if (uptime(&uptime_secs, &idle_secs) == 0) + if ((uptime_secs=uptime(0,0)) == 0) xerrx(EXIT_FAILURE, "uptime"); if (opt_newest) saved_start_time = 0ULL;