diff -u -r ../procps-ng-3.3.15/proc/sysinfo.c ./proc/sysinfo.c --- ../procps-ng-3.3.15/proc/sysinfo.c 2018-05-18 21:32:22.010979780 +0000 +++ ./proc/sysinfo.c 2019-08-07 19:53:05.528343190 +0000 @@ -33,6 +33,9 @@ #ifdef __CYGWIN__ #include #endif +#ifdef __ANDROID__ +#include +#endif #include "alloc.h" #include "version.h" #include "sysinfo.h" /* include self to verify prototypes */ @@ -104,6 +107,18 @@ /***********************************************************************/ int uptime(double *restrict uptime_secs, double *restrict idle_secs) { +#ifdef __ANDROID__ + /* Android does not allow read access to /proc/uptime */ + SET_IF_DESIRED(idle_secs, 0.); + struct sysinfo system_information; + if (sysinfo(&system_information) == 0) { + SET_IF_DESIRED(uptime_secs, (double) system_information.uptime); + return (double) system_information.uptime; + } else { + SET_IF_DESIRED(uptime_secs, 0.); + return 0; + } +#else double up=0, idle=0; char *savelocale; @@ -121,6 +136,7 @@ SET_IF_DESIRED(uptime_secs, up); SET_IF_DESIRED(idle_secs, idle); return up; /* assume never be zero seconds in practice */ +#endif } unsigned long getbtime(void) { @@ -134,6 +150,7 @@ /* /proc/stat can get very large on multi-CPU systems so we can't use FILE_TO_BUF */ if (!(f = fopen(STAT_FILE, "r"))) { + return 0; fputs(BAD_OPEN_MESSAGE, stderr); fflush(NULL); _exit(102); @@ -193,7 +210,9 @@ double up_1, up_2, seconds; unsigned long long jiffies; unsigned h; +#ifndef __ANDROID__ char *savelocale; +#endif long hz; #ifdef _SC_CLK_TCK @@ -204,8 +223,10 @@ #endif wait_j = hirq_j = sirq_j = stol_j = 0; +#ifndef __ANDROID__ savelocale = strdup(setlocale(LC_NUMERIC, NULL)); setlocale(LC_NUMERIC, "C"); +#endif do{ FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); /* uptime(&up_1, NULL); */ @@ -214,8 +235,10 @@ FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2); /* uptime(&up_2, NULL); */ } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ +#ifndef __ANDROID__ setlocale(LC_NUMERIC, savelocale); free(savelocale); +#endif jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ; seconds = (up_1 + up_2) / 2; h = (unsigned)( (double)jiffies/seconds/smp_num_cpus ); @@ -445,18 +468,30 @@ /***********************************************************************/ void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) { double avg_1=0, avg_5=0, avg_15=0; +#ifndef __ANDROID__ char *savelocale; +#endif + + if (loadavg_fd == -1 && (loadavg_fd = open(LOADAVG_FILE, O_RDONLY)) == -1) { + return; + } FILE_TO_BUF(LOADAVG_FILE,loadavg_fd); +#ifndef __ANDROID__ savelocale = strdup(setlocale(LC_NUMERIC, NULL)); setlocale(LC_NUMERIC, "C"); +#endif if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) { fputs("bad data in " LOADAVG_FILE "\n", stderr); +#ifndef __ANDROID__ free(savelocale); +#endif exit(1); } +#ifndef __ANDROID__ setlocale(LC_NUMERIC, savelocale); free(savelocale); +#endif SET_IF_DESIRED(av1, avg_1); SET_IF_DESIRED(av5, avg_5); SET_IF_DESIRED(av15, avg_15); @@ -791,27 +826,8 @@ mem_used = kb_main_total - kb_main_free; kb_main_used = (unsigned long)mem_used; - /* zero? might need fallback for 2.6.27 <= kernel