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

library: enable an 'invariant' stack for that pids API

Browse Source 
After peeking at possible conversion of the ps program
it appeared that we may ultimately need the concept of
a 'static' pids_stack in suport of look_up_our_self().
In other words, one not impacted by procps_pids_reset.

This patch simply sets the stage for that possibility.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2015-09-10 00:00:00 -05:00 committed by Craig Small
parent 80f1a05b78
commit 42af8ffbc1
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
proc/pids.c
View File

@ -69,7 +69,7 @@ struct procps_pidsinfo {
struct pids_stack **anchor; // reapable stacks (consolidated extents) struct pids_stack **anchor; // reapable stacks (consolidated extents)
int alloc_total; // number of above pointers allocated int alloc_total; // number of above pointers allocated
int inuse_total; // number of above pointers occupied int inuse_total; // number of above pointers occupied
struct stacks_extent *extents; // anchor for all allocated extents struct stacks_extent *extents; // anchor for all resettable extents
int history_yes; // need historical data int history_yes; // need historical data
struct history_info *hist; // pointer to historical support data struct history_info *hist; // pointer to historical support data
int dirty_stacks; // extents need dynamic storage clean int dirty_stacks; // extents need dynamic storage clean
@ -768,7 +768,11 @@ static inline void cleanup_stacks_all (
} // end: cleanup_stacks_all } // end: cleanup_stacks_all
static int free_extent ( /*
* This routine exists in case we ever want to offer something like
* 'static' or 'invarient' results stacks. By unsplicing an extent
* from the info anchor it will be isolated from future reset/free. */
static struct stacks_extent *extent_cut (
struct procps_pidsinfo *info, struct procps_pidsinfo *info,
struct stacks_extent *ext) struct stacks_extent *ext)
{ {
@ -777,20 +781,30 @@ static int free_extent (
if (ext) { if (ext) {
if (ext == p) { if (ext == p) {
info->extents = p->next; info->extents = p->next;
free(ext); return ext;
return 0;
} }
do { do {
if (ext == p->next) { if (ext == p->next) {
p->next = p->next->next; p->next = p->next->next;
free(ext); return ext;
return 0;
} }
p = p->next; p = p->next;
} while (p); } while (p);
} }
return NULL;
} // end: extent_cut
static int extent_free (
struct procps_pidsinfo *info,
struct stacks_extent *ext)
{
if (extent_cut(info, ext)) {
free(ext);
return 0;
}
return -1; return -1;
} // end: free_extent } // end: extent_free
static inline int items_check_failed ( static inline int items_check_failed (
@ -1050,7 +1064,7 @@ PROCPS_EXPORT int procps_pids_read_shut (
if (info == NULL || ! READS_BEGUN) if (info == NULL || ! READS_BEGUN)
return -EINVAL; return -EINVAL;
oldproc_close(info); oldproc_close(info);
rc = free_extent(info, info->read); rc = extent_free(info, info->read);
info->read = NULL; info->read = NULL;
return rc; return rc;
} // end: procps_pids_read_shut } // end: procps_pids_read_shut
@ -1262,7 +1276,7 @@ PROCPS_EXPORT int procps_pids_stacks_dealloc (
return -EINVAL; return -EINVAL;
ext = (struct stacks_extent *)(*these); ext = (struct stacks_extent *)(*these);
rc = free_extent(info, ext); rc = extent_free(info, ext);
*these = NULL; *these = NULL;
return rc; return rc;
} // end: procps_pids_stacks_dealloc } // end: procps_pids_stacks_dealloc