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

misc: adapt pgms to pids_sort_order change, <PIDS> api

Browse Source 
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner
2016-06-06 00:00:00 -05:00
committed by Craig Small
parent aa9f00dcaf
commit 5f2570c384
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ps/display.c
View File

@@ -313,9 +313,9 @@ static void simple_spew(void){
break;
case TF_show_proc|TF_show_task: // m and -m options
procps_pids_sort(Pids_info, pidread->stacks
, pidread->counts.total, PROCPS_PIDS_TIME_START, PROCPS_SORT_ASCEND);
, pidread->counts.total, PROCPS_PIDS_TIME_START, PROCPS_PIDS_ASCEND);
procps_pids_sort(Pids_info, pidread->stacks
, pidread->counts.total, PROCPS_PIDS_ID_TGID, PROCPS_SORT_ASCEND);
, pidread->counts.total, PROCPS_PIDS_ID_TGID, PROCPS_PIDS_ASCEND);
for (i = 0; i < pidread->counts.total; i++) {
buf = pidread->stacks[i];
next_proc:
@@ -343,7 +343,7 @@ static void prep_forest_sort(void){
incoming = search_format_array("ppid");
if(!incoming) { fprintf(stderr, _("could not find ppid\n")); exit(1); }
tmp_list = xmalloc(sizeof(sort_node));
tmp_list->reverse = PROCPS_SORT_ASCEND;
tmp_list->reverse = PROCPS_PIDS_ASCEND;
tmp_list->typecode = '?'; /* what was this for? */
tmp_list->sr = incoming->sr;
tmp_list->next = sort_list;
@@ -353,7 +353,7 @@ static void prep_forest_sort(void){
incoming = search_format_array("start_time");
if(!incoming) { fprintf(stderr, _("could not find start_time\n")); exit(1); }
tmp_list = xmalloc(sizeof(sort_node));
tmp_list->reverse = PROCPS_SORT_ASCEND;
tmp_list->reverse = PROCPS_PIDS_ASCEND;
tmp_list->typecode = '?'; /* what was this for? */
tmp_list->sr = incoming->sr;
tmp_list->next = sort_list;

10
ps/sortformat.c
View File

@@ -317,9 +317,9 @@ out:
/**************** Parse single sort specifier *******************/
static sort_node *do_one_sort_spec(const char *spec){
const format_struct *fs;
enum pids_sort_order reverse = PROCPS_SORT_ASCEND;
enum pids_sort_order reverse = PROCPS_PIDS_ASCEND;
if(*spec == '-'){
reverse = PROCPS_SORT_DESCEND;
reverse = PROCPS_PIDS_DESCEND;
spec++;
} else if(*spec == '+'){
spec++;
@@ -452,7 +452,7 @@ static const char *verify_short_sort(const char *arg){
/************ parse short sorting option *************/
static const char *short_sort_parse(sf_node *sfn){
enum pids_sort_order direction = PROCPS_SORT_ASCEND;
enum pids_sort_order direction = PROCPS_PIDS_ASCEND;
const char *walk;
int tmp;
sort_node *snode;
@@ -466,10 +466,10 @@ static const char *short_sort_parse(sf_node *sfn){
already_parsed_sort = 1;
return NULL;
case '+':
direction = PROCPS_SORT_ASCEND;
direction = PROCPS_PIDS_ASCEND;
break;
case '-':
direction = PROCPS_SORT_DESCEND;
direction = PROCPS_PIDS_DESCEND;
break;
default:
ss = search_shortsort_array(tmp);