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

library: remove procps_pagesize_get()

Browse Source 
This is actually a systemcall getpagesize(2) or it is defined
in configure using a variety of methods, including a default
hard coded value as a last resort.

There is no need to have this in libprocps
This commit is contained in:
Craig Small 2015-07-02 20:54:11 +10:00
parent 855a6a7055
commit 62f9a51532
4 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proc/libprocps.sym
View File

@ -36,7 +36,6 @@ global:
procps_meminfo_unref; procps_meminfo_unref;
procps_meminfo_get; procps_meminfo_get;
procps_meminfo_get_chain; procps_meminfo_get_chain;
procps_pagesize_get;
procps_stat_new; procps_stat_new;
procps_stat_read; procps_stat_read;
procps_stat_read_jiffs; procps_stat_read_jiffs;

16
proc/sysinfo.c
View File

@ -113,22 +113,6 @@ PROCPS_EXPORT long procps_hertz_get(void)
return 100; return 100;
} }
/*
* procps_pagesize_get:
*
* Return the size of pages in bytes
*
* Returns: size of pages in bytes
*/
PROCPS_EXPORT long procps_pagesize_get(void)
{
long psiz;
if ((psiz = sysconf(_SC_PAGESIZE)) > 0)
return psiz;
return 1;
}
/* /*
* procps_loadavg: * procps_loadavg:
* @av1: location to store 1 minute load average * @av1: location to store 1 minute load average

1
proc/sysinfo.h
View File

@ -11,7 +11,6 @@ extern int have_privs; /* boolean, true if setuid or similar */
long procps_cpu_count(void); long procps_cpu_count(void);
long procps_hertz_get(void); long procps_hertz_get(void);
int procps_loadavg(double *av1, double *av5, double *av15); int procps_loadavg(double *av1, double *av5, double *av15);
long procps_pagesize_get(void);
#define BUFFSIZE (64*1024) #define BUFFSIZE (64*1024)
typedef unsigned long long jiff; typedef unsigned long long jiff;

2
top/top.c
View File

@ -3253,7 +3253,7 @@ static void before (char *me) {
// establish cpu particulars // establish cpu particulars
Hertz = procps_hertz_get(); Hertz = procps_hertz_get();
Cpu_cnt = procps_cpu_count(); Cpu_cnt = procps_cpu_count();
Page_size = procps_pagesize_get(); Page_size = getpagesize();
#ifdef PRETEND8CPUS #ifdef PRETEND8CPUS
Cpu_cnt = 8; Cpu_cnt = 8;
#endif #endif