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

new /proc/meminfo fields

Browse Source
This commit is contained in:
albert
2008-03-24 04:41:26 +00:00
parent c0f3df30ca
commit 7dd414ac1b
6 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ps/output.c
View File

@@ -612,10 +612,10 @@ static int pr_class(char *restrict const outbuf, const proc_t *restrict const pp
case 3: return snprintf(outbuf, COLWID, "B"); // SCHED_BATCH
case 4: return snprintf(outbuf, COLWID, "#4"); // SCHED_ISO? (Con Kolivas)
case 5: return snprintf(outbuf, COLWID, "#5"); // SCHED_IDLEPRIO? (Con Kolivas)
case 8: return snprintf(outbuf, COLWID, "#6"); //
case 8: return snprintf(outbuf, COLWID, "#7"); //
case 6: return snprintf(outbuf, COLWID, "#6"); //
case 7: return snprintf(outbuf, COLWID, "#7"); //
case 8: return snprintf(outbuf, COLWID, "#8"); //
case 8: return snprintf(outbuf, COLWID, "#9"); //
case 9: return snprintf(outbuf, COLWID, "#9"); //
default: return snprintf(outbuf, COLWID, "?"); // unknown value
}
}
@@ -971,6 +971,12 @@ static int help_pr_sig(unsigned long long sig){
}
#endif
// This one is always thread-specific pending. (from Dragonfly BSD)
static int pr_tsig(char *restrict const outbuf, const proc_t *restrict const pp){
return help_pr_sig(outbuf, pp->_sigpnd);
}
// This one is (wrongly?) thread-specific when printing thread lines,
// but process-pending otherwise.
static int pr_sig(char *restrict const outbuf, const proc_t *restrict const pp){
return help_pr_sig(outbuf, pp->signal);
}
@@ -1331,7 +1337,6 @@ static const format_struct format_array[] = {
{"fuser", "FUSER", pr_fuser, sr_fuser, 8, USR, LNX, ET|USER},
{"gid", "GID", pr_egid, sr_egid, 5, 0, SUN, ET|RIGHT},
{"group", "GROUP", pr_egroup, sr_egroup, 8, GRP, U98, ET|USER},
{"iac", "IAC", pr_nop, sr_nop, 4, 0, BSD, AN|RIGHT}, // DragonFly
{"ignored", "IGNORED", pr_sigignore,sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigignore*/
{"inblk", "INBLK", pr_nop, sr_nop, 5, 0, BSD, AN|RIGHT}, /*inblock*/
{"inblock", "INBLK", pr_nop, sr_nop, 5, 0, DEC, AN|RIGHT}, /*inblk*/
@@ -1468,6 +1473,7 @@ static const format_struct format_array[] = {
{"tsess", "TSESS", pr_nop, sr_nop, 5, 0, BSD, PO|PIDMAX|RIGHT},
{"tsession", "TSESS", pr_nop, sr_nop, 5, 0, DEC, PO|PIDMAX|RIGHT},
{"tsid", "TSID", pr_nop, sr_nop, 5, 0, BSD, PO|PIDMAX|RIGHT},
{"tsig", "PENDING", pr_tsig, sr_nop, 9, 0, BSD, ET|SIGNAL},
{"tsiz", "TSIZ", pr_tsiz, sr_nop, 4, 0, BSD, PO|RIGHT},
{"tt", "TT", pr_tty8, sr_tty, 8, 0, BSD, PO|LEFT},
{"tty", "TT", pr_tty8, sr_tty, 8, 0, U98, PO|LEFT}, /* Unix98 requires "TT" but has "TTY" too. :-( */ /* was 3 wide */

11
ps/parser.c
View File

@@ -729,17 +729,6 @@ static const char *parse_bsd_option(void){
trace("x Select processes without controlling ttys\n");
simple_select |= SS_B_x;
break;
#if 0
case 'y':
// DragonFlyBSD iac (interactivity measure) format
// uid,pid,ppid,cpu,pri,iac,nice,wchan,state,tt,time,command
// (they use 'Y' to sort by this "iac" thing; 'y' implies 'Y')
// Range is -127 .. 127, with lower numbers being more
// interactive and higher numbers more batch-like.
trace("y Display interactivity measure\n");
format_flags |= FF_Bv;
break;
#endif
case '-':
return "Embedded '-' among BSD options makes no sense.";
break;

2
ps/sortformat.c
View File

@@ -325,6 +325,8 @@ static sort_node *do_one_sort_spec(const char *spec){
if(*spec == '-'){
reverse = 1;
spec++;
} else if(*spec == '+'){
spec++;
}
fs = search_format_array(spec);
if(fs){