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

top: some minor renaming, reformatting and rearranging

Browse Source 
This commit just addresses these miscellaneous issues:
. always use 'p' for pointers to that proc_t structure
. always match order of local #undef to parent #define
. forest_create use of array index made more efficient

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2018-07-04 00:00:00 -05:00 committed by Craig Small
parent 38a668909f
commit 8c9daf45ab
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
top/top.c
View File

@ -1780,8 +1780,8 @@ static FLD_t Fieldstab[] = {
#define SF(f) (QFP_t)SCB_NAME(f) #define SF(f) (QFP_t)SCB_NAME(f)
// these identifiers reflect the default column alignment but they really // these identifiers reflect the default column alignment but they really
// contain the WIN_t flag used to check/change justification at run-time! // contain the WIN_t flag used to check/change justification at run-time!
#define A_right Show_JRNUMS /* toggled with upper case 'J' */
#define A_left Show_JRSTRS /* toggled with lower case 'j' */ #define A_left Show_JRSTRS /* toggled with lower case 'j' */
#define A_right Show_JRNUMS /* toggled with upper case 'J' */
/* .width anomalies: /* .width anomalies:
a -1 width represents variable width columns a -1 width represents variable width columns
@ -3254,7 +3254,7 @@ static inline void insp_show_pgs (int col, int row, int max) {
/* /*
* This guy is responsible for displaying the Insp_buf contents and * This guy is responsible for displaying the Insp_buf contents and
* managing all scrolling/locate requests until the user gives up. */ * managing all scrolling/locate requests until the user gives up. */
static int insp_view_choice (proc_t *obj) { static int insp_view_choice (proc_t *p) {
#ifdef INSP_SLIDE_1 #ifdef INSP_SLIDE_1
#define hzAMT 1 #define hzAMT 1
#else #else
@ -3262,8 +3262,8 @@ static int insp_view_choice (proc_t *obj) {
#endif #endif
#define maxLN (Screen_rows - (Msg_row +1)) #define maxLN (Screen_rows - (Msg_row +1))
#define makHD(b1,b2) { \ #define makHD(b1,b2) { \
snprintf(b1, sizeof(b1), "%d", obj->tid); \ snprintf(b1, sizeof(b1), "%d", p->tid); \
snprintf(b2, sizeof(b2), "%s", obj->cmd); } snprintf(b2, sizeof(b2), "%s", p->cmd); }
#define makFS(dst) { if (Insp_sel->flen < 22) \ #define makFS(dst) { if (Insp_sel->flen < 22) \
snprintf(dst, sizeof(dst), "%s", Insp_sel->fstr); \ snprintf(dst, sizeof(dst), "%s", Insp_sel->fstr); \
else snprintf(dst, sizeof(dst), "%.19s...", Insp_sel->fstr); } else snprintf(dst, sizeof(dst), "%.19s...", Insp_sel->fstr); }
@ -4775,12 +4775,12 @@ static void forest_create (WIN_t *q) {
char level = Tree_ppt[j]->pad_3; char level = Tree_ppt[j]->pad_3;
while (j+1 < Frame_maxtask && Tree_ppt[j+1]->pad_3 > level) { while (j+1 < Frame_maxtask && Tree_ppt[j+1]->pad_3 > level) {
Tree_ppt[j+1]->pad_2 = 'z'; ++j;
Tree_ppt[j]->pad_2 = 'z';
#ifndef TREE_VCPUOFF #ifndef TREE_VCPUOFF
Hide_cpu[parent] += Tree_ppt[j+1]->pcpu; Hide_cpu[parent] += Tree_ppt[j]->pcpu;
#endif #endif
children = 1; children = 1;
++j;
} }
// children found (and collapsed), so mark that puppy // children found (and collapsed), so mark that puppy
if (children) Tree_ppt[parent]->pad_2 = 'x'; if (children) Tree_ppt[parent]->pad_2 = 'x';
@ -6320,8 +6320,8 @@ static int window_show (WIN_t *q, int wmax) {
} }
return lwin; return lwin;
#undef winMIN
#undef isBUSY #undef isBUSY
#undef winMIN
} // end: window_show } // end: window_show
/*###### Entry point plus two ##########################################*/ /*###### Entry point plus two ##########################################*/

2
top/top.h
View File

@ -761,7 +761,7 @@ typedef struct WIN_t {
//atic void insp_mkrow_raw (int col, int row); //atic void insp_mkrow_raw (int col, int row);
//atic void insp_mkrow_utf8 (int col, int row); //atic void insp_mkrow_utf8 (int col, int row);
//atic void insp_show_pgs (int col, int row, int max); //atic void insp_show_pgs (int col, int row, int max);
//atic int insp_view_choice (proc_t *obj); //atic int insp_view_choice (proc_t *p);
//atic void inspection_utility (int pid); //atic void inspection_utility (int pid);
/*------ Other Filtering ------------------------------------------------*/ /*------ Other Filtering ------------------------------------------------*/
//atic const char *osel_add (WIN_t *q, int ch, char *glob, int push); //atic const char *osel_add (WIN_t *q, int ch, char *glob, int push);