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

library: changed use of 'fill' to 'select', <pids> API

Browse Source 
Remove a remnant of this new API's evolution.  Here we
no longer fill stacks, rather we reap and select them.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2016-04-18 00:00:00 -05:00 committed by Craig Small
parent e7585992d9
commit edb124ec86
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proc/pids.c
View File

@ -1386,7 +1386,7 @@ PROCPS_EXPORT struct pids_reap *procps_pids_select (
struct procps_pidsinfo *info, struct procps_pidsinfo *info,
unsigned *these, unsigned *these,
int maxthese, int maxthese,
enum pids_fill_type which) enum pids_select_type which)
{ {
unsigned ids[FILL_ID_MAX + 1]; unsigned ids[FILL_ID_MAX + 1];
int rc; int rc;
@ -1395,10 +1395,10 @@ PROCPS_EXPORT struct pids_reap *procps_pids_select (
return NULL; return NULL;
if (maxthese < 1 || maxthese > FILL_ID_MAX) if (maxthese < 1 || maxthese > FILL_ID_MAX)
return NULL; return NULL;
if (which != PROCPS_FILL_PID && which != PROCPS_FILL_UID) if (which != PROCPS_SELECT_PID && which != PROCPS_SELECT_UID)
return NULL; return NULL;
// this zero delimiter is really only needed with PROCPS_FILL_PID // this zero delimiter is really only needed with PROCPS_SELECT_PID
memcpy(ids, these, sizeof(unsigned) * maxthese); memcpy(ids, these, sizeof(unsigned) * maxthese);
ids[maxthese] = 0; ids[maxthese] = 0;

8
proc/pids.h
View File

@ -148,9 +148,9 @@ enum pids_item {
PROCPS_PIDS_WCHAN_NAME, // str PROCPS_PIDS_WCHAN_NAME, // str
}; };
enum pids_fill_type { enum pids_select_type {
PROCPS_FILL_PID = 0x1000, PROCPS_SELECT_PID = 0x1000,
PROCPS_FILL_UID = 0x4000 PROCPS_SELECT_UID = 0x4000
}; };
enum pids_reap_type { enum pids_reap_type {
@ -234,7 +234,7 @@ struct pids_reap *procps_pids_select (
struct procps_pidsinfo *info, struct procps_pidsinfo *info,
unsigned *these, unsigned *these,
int maxthese, int maxthese,
enum pids_fill_type which); enum pids_select_type which);
struct pids_stack **procps_pids_sort ( struct pids_stack **procps_pids_sort (
struct procps_pidsinfo *info, struct procps_pidsinfo *info,