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

top: trade Page_size for that newly exposed page_bytes

Browse Source 
Might as well use the newly exposed sysinfo.h variable
'page_bytes' rather than our own. Plus, in the process
we can avoid incurring yet one more function call hit.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2014-07-17 12:12:12 -05:00 committed by Jaromir Capik
parent e4f0b4ebf3
commit 9500dc198c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
top/top.c
View File

@ -87,7 +87,6 @@ static RCF_t Rc = DEF_RCFILE;
static int Rc_questions; static int Rc_questions;
/* The run-time acquired page stuff */ /* The run-time acquired page stuff */
static unsigned Page_size;
static unsigned Pg2K_shft = 0; static unsigned Pg2K_shft = 0;
/* SMP, Irix/Solaris mode, Linux 2.5.xx support */ /* SMP, Irix/Solaris mode, Linux 2.5.xx support */
@ -413,8 +412,8 @@ static void bye_bye (const char *str) {
"\n\tProgram" "\n\tProgram"
"\n\t Linux version = %u.%u.%u, %s" "\n\t Linux version = %u.%u.%u, %s"
"\n\t Hertz = %u (%u bytes, %u-bit time)" "\n\t Hertz = %u (%u bytes, %u-bit time)"
"\n\t Page_size = %d, Cpu_faux_tot = %d, smp_num_cpus = %d" "\n\t page_bytes = %d, Cpu_faux_tot = %d, smp_num_cpus = %d"
"\n\t sizeof(CPU_t) = %u, sizeof(HST_t) = %u (%u HST_t's/Page), HHist_siz = %u" "\n\t sizeof(CPU_t) = %u, sizeof(HST_t) = %u (%d HST_t's/Page), HHist_siz = %u"
"\n\t sizeof(proc_t) = %u, sizeof(proc_t.cmd) = %u, sizeof(proc_t*) = %u" "\n\t sizeof(proc_t) = %u, sizeof(proc_t.cmd) = %u, sizeof(proc_t*) = %u"
"\n\t Frames_libflags = %08lX" "\n\t Frames_libflags = %08lX"
"\n\t SCREENMAX = %u, ROWMINSIZ = %u, ROWMAXSIZ = %u" "\n\t SCREENMAX = %u, ROWMINSIZ = %u, ROWMAXSIZ = %u"
@ -446,8 +445,8 @@ static void bye_bye (const char *str) {
, LINUX_VERSION_PATCH(linux_version_code) , LINUX_VERSION_PATCH(linux_version_code)
, procps_version , procps_version
, (unsigned)Hertz, (unsigned)sizeof(Hertz), (unsigned)sizeof(Hertz) * 8 , (unsigned)Hertz, (unsigned)sizeof(Hertz), (unsigned)sizeof(Hertz) * 8
, Page_size, Cpu_faux_tot, (int)smp_num_cpus, (unsigned)sizeof(CPU_t) , (int)page_bytes, Cpu_faux_tot, (int)smp_num_cpus, (unsigned)sizeof(CPU_t)
, (unsigned)sizeof(HST_t), Page_size / (unsigned)sizeof(HST_t), HHist_siz , (unsigned)sizeof(HST_t), ((int)page_bytes / (int)sizeof(HST_t)), HHist_siz
, (unsigned)sizeof(proc_t), (unsigned)sizeof(p->cmd), (unsigned)sizeof(proc_t*) , (unsigned)sizeof(proc_t), (unsigned)sizeof(p->cmd), (unsigned)sizeof(proc_t*)
, (long)Frames_libflags , (long)Frames_libflags
, (unsigned)SCREENMAX, (unsigned)ROWMINSIZ, (unsigned)ROWMAXSIZ , (unsigned)SCREENMAX, (unsigned)ROWMINSIZ, (unsigned)ROWMAXSIZ
@ -3302,8 +3301,7 @@ static void before (char *me) {
Cpu_States_fmts = N_unq(STATE_lin2x7_fmt); Cpu_States_fmts = N_unq(STATE_lin2x7_fmt);
// get virtual page stuff // get virtual page stuff
Page_size = getpagesize(); i = page_bytes; // from sysinfo.c, at lib init
i = Page_size;
while(i > 1024) { i >>= 1; Pg2K_shft++; } while(i > 1024) { i >>= 1; Pg2K_shft++; }
#ifndef OFF_HST_HASH #ifndef OFF_HST_HASH