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

library: removed that 'simple_readtask' unused pointer

Browse Source 
This patch just eliminates a parameter present for the
simple_readtask() function which is not needed nor has
it ever actually been used. It will make calls to that
function (via taskreader ptr) slightly more efficient.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2019-09-29 00:00:00 -05:00 committed by Craig Small
parent b5587b7b94
commit 281c37d1cd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proc/readproc.c
View File

@ -1132,10 +1132,9 @@ next_proc:
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
// This reads /proc/*/task/* data, for one task. // This reads /proc/*/task/* data, for one task.
// p is the POSIX process (task group leader, not needed by THIS implementation)
// t is the POSIX thread (task group member, generally not the leader) // t is the POSIX thread (task group member, generally not the leader)
// path is a path to the task, with some room to spare. // path is a path to the task, with some room to spare.
static proc_t* simple_readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict const t, char *restrict const path) { static proc_t* simple_readtask(PROCTAB *restrict const PT, proc_t *restrict const t, char *restrict const path) {
static struct utlbuf_s ub = { NULL, 0 }; // buf for stat,statm,status static struct utlbuf_s ub = { NULL, 0 }; // buf for stat,statm,status
static struct stat sb; // stat() buffer static struct stat sb; // stat() buffer
unsigned flags = PT->flags; unsigned flags = PT->flags;
@ -1239,7 +1238,6 @@ static proc_t* simple_readtask(PROCTAB *restrict const PT, const proc_t *restric
errno = ENOMEM; errno = ENOMEM;
next_task: next_task:
return NULL; return NULL;
(void)p;
} }
@ -1378,7 +1376,7 @@ next_proc:
next_task: next_task:
// fills in our path, plus x->tid and x->tgid // fills in our path, plus x->tid and x->tgid
if ((!(PT->taskfinder(PT,&skel_p,x,path))) // simple_nexttid if ((!(PT->taskfinder(PT,&skel_p,x,path))) // simple_nexttid
|| (!(ret = PT->taskreader(PT,new_p,x,path)))) { // simple_readtask || (!(ret = PT->taskreader(PT,x,path)))) { // simple_readtask
goto next_proc; goto next_proc;
} }
if (!new_p) { if (!new_p) {

2
proc/readproc.h
View File

@ -172,7 +172,7 @@ typedef struct PROCTAB {
int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const); int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const);
proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const); proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const);
int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const);
proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); proc_t*(*taskreader)(struct PROCTAB *__restrict const, proc_t *__restrict const, char *__restrict const);
pid_t* pids; // pids of the procs pid_t* pids; // pids of the procs
uid_t* uids; // uids of procs uid_t* uids; // uids of procs
int nuid; // cannot really sentinel-terminate unsigned short[] int nuid; // cannot really sentinel-terminate unsigned short[]