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

library: Update uptime calls to standard format

Browse Source 
Changed all the uptime related functions to use the
standard naming procps_uptime_*
This commit is contained in:
Craig Small
2015-06-29 22:09:59 +10:00
parent 56399212c8
commit 639daf5468
8 changed files with 130 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proc/libprocps.sym
View File

@ -40,7 +40,6 @@ global:
meminfo;
openproc;
page_bytes;
print_uptime;
put_slabinfo;
readeither;
readproc;
@ -49,12 +48,8 @@ global:
readproctab;
readtask;
smp_num_cpus;
sprint_uptime;
tty_to_dev;
user_from_uid;
uptime;
sprint_uptime;
sprint_uptime_short;
procps_hertz_get;
procps_linux_version;
procps_meminfo_new;
@ -76,6 +71,9 @@ global:
procps_stat_get_jiffs_hist_all;
procps_stat_get_sys;
procps_stat_get_sys_chain;
procps_uptime;
procps_uptime_sprint;
procps_uptime_sprint_short;
procps_vmstat_new;
procps_vmstat_read;
procps_vmstat_ref;

105
proc/uptime.c
View File

@ -47,13 +47,14 @@ static int count_users(void)
setutent();
while ((ut = getutent())) {
if ((ut->ut_type == USER_PROCESS) && (ut->ut_name[0] != '\0'))
numuser++;
if ((ut->ut_type == USER_PROCESS) && (ut->ut_name[0] != '\0'))
numuser++;
}
endutent();
return numuser;
}
/*
* uptime:
*
@ -64,7 +65,9 @@ static int count_users(void)
*
* Returns: uptime_secs on success and <0 on failure
*/
PROCPS_EXPORT int uptime(double *restrict uptime_secs, double *restrict idle_secs)
PROCPS_EXPORT int procps_uptime(
double *restrict uptime_secs,
double *restrict idle_secs)
{
double up=0, idle=0;
char *savelocale;
@ -72,33 +75,34 @@ PROCPS_EXPORT int uptime(double *restrict uptime_secs, double *restrict idle_sec
FILE *fp;
if ((fp = fopen(UPTIME_FILE, "r")) == NULL)
return -errno;
return -errno;
savelocale = strdup(setlocale(LC_NUMERIC, NULL));
setlocale(LC_NUMERIC, "C");
if (fscanf(fp, "%lf %lf", &up, &idle) < 2) {
setlocale(LC_NUMERIC, savelocale);
free(savelocale);
fclose(fp);
return -ERANGE;
setlocale(LC_NUMERIC, savelocale);
free(savelocale);
fclose(fp);
return -ERANGE;
}
fclose(fp);
setlocale(LC_NUMERIC, savelocale);
free(savelocale);
if (uptime_secs)
*uptime_secs = up;
*uptime_secs = up;
if (idle_secs)
*idle_secs = idle;
*idle_secs = idle;
return up;
}
/*
* sprint_uptime:
* procps_uptime_sprint:
*
* Print current time in nice format
*
* Returns a statically allocated upbuf or NULL on error
*/
PROCPS_EXPORT char *sprint_uptime(void)
PROCPS_EXPORT char *procps_uptime_sprint(void)
{
int upminutes, uphours, updays, users;
int pos;
@ -109,34 +113,41 @@ PROCPS_EXPORT char *sprint_uptime(void)
upbuf[0] = '\0';
if (time(&realseconds) < 0)
return upbuf;
return upbuf;
realtime = localtime(&realseconds);
if (uptime(&uptime_secs, &idle_secs) < 0)
return upbuf;
if (procps_uptime(&uptime_secs, &idle_secs) < 0)
return upbuf;
updays = ((int) uptime_secs / (60*60*24));
uphours = ((int) uptime_secs / (60*60)) % 24;
upminutes = ((int) uptime_secs / (60)) % 60;
pos = sprintf(upbuf, " %02d:%02d:%02d up %d %s, ",
realtime->tm_hour, realtime->tm_min, realtime->tm_sec,
updays, (updays != 1) ? "days" : "day");
realtime->tm_hour, realtime->tm_min, realtime->tm_sec,
updays, (updays != 1) ? "days" : "day");
if (uphours)
pos += sprintf(upbuf + pos, "%2d:%02d, ", uphours, upminutes);
pos += sprintf(upbuf + pos, "%2d:%02d, ", uphours, upminutes);
else
pos += sprintf(upbuf + pos, "%d min, ", uphours, upminutes);
pos += sprintf(upbuf + pos, "%d min, ", uphours, upminutes);
users = count_users();
loadavg(&av1, &av5, &av15);
pos += sprintf(upbuf + pos, "%2d user%s, load average: %.2f, %.2f, %.2f",
users, users == 1 ? "" : "s",
av1, av5, av15);
users, users == 1 ? "" : "s",
av1, av5, av15);
return upbuf;
}
PROCPS_EXPORT char *sprint_uptime_short(void)
/*
* procps_uptime_sprint_short:
*
* Print current time in nice format
*
* Returns a statically allocated buffer or NULL on error
*/
PROCPS_EXPORT char *procps_uptime_sprint_short(void)
{
int updecades, upyears, upweeks, updays, uphours, upminutes;
int pos = 3;
@ -146,8 +157,8 @@ PROCPS_EXPORT char *sprint_uptime_short(void)
double uptime_secs, idle_secs;
shortbuf[0] = '\0';
if (uptime(&uptime_secs, &idle_secs) < 0)
return shortbuf;
if (procps_uptime(&uptime_secs, &idle_secs) < 0)
return shortbuf;
updecades = (int) uptime_secs / (60*60*24*365*10);
upyears = ((int) uptime_secs / (60*60*24*365)) % 10;
@ -159,44 +170,44 @@ PROCPS_EXPORT char *sprint_uptime_short(void)
strcat(shortbuf, "up ");
if (updecades) {
pos += sprintf(shortbuf + pos, "%d %s",
updecades, updecades > 1 ? "decades" : "decade");
comma +1;
pos += sprintf(shortbuf + pos, "%d %s",
updecades, updecades > 1 ? "decades" : "decade");
comma +1;
}
if (upyears) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upyears,
upyears > 1 ? "years" : "year");
comma += 1;
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upyears,
upyears > 1 ? "years" : "year");
comma += 1;
}
if (upweeks) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upweeks,
upweeks > 1 ? "weeks" : "week");
comma += 1;
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upweeks,
upweeks > 1 ? "weeks" : "week");
comma += 1;
}
if (updays) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", updays,
updays > 1 ? "days" : "day");
comma += 1;
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", updays,
updays > 1 ? "days" : "day");
comma += 1;
}
if (uphours) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", uphours,
uphours > 1 ? "hours" : "hour");
comma += 1;
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", uphours,
uphours > 1 ? "hours" : "hour");
comma += 1;
}
if (upminutes) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upminutes,
upminutes > 1 ? "minutes" : "minute");
comma += 1;
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upminutes,
upminutes > 1 ? "minutes" : "minute");
comma += 1;
}
return shortbuf;
}

6
proc/uptime.h
View File

@ -29,9 +29,9 @@
__BEGIN_DECLS
int uptime(double *uptime_secs, double *idle_secs);
char *sprint_uptime(void);
char *sprint_uptime_short(void);
int procps_uptime(double *uptime_secs, double *idle_secs);
char *procps_uptime_sprint(void);
char *procps_uptime_sprint_short(void);
__END_DECLS