1 diff -u -r ../procps-ng-3.3.9/proc/sysinfo.c ./proc/sysinfo.c
2 --- ../procps-ng-3.3.9/proc/sysinfo.c 2013-09-11 13:57:56.000000000 +0200
3 +++ ./proc/sysinfo.c 2014-07-06 08:35:27.678833325 +0200
5 /***********************************************************************/
6 int uptime(double *restrict uptime_secs, double *restrict idle_secs) {
12 FILE_TO_BUF(UPTIME_FILE,uptime_fd);
14 savelocale = strdup(setlocale(LC_NUMERIC, NULL));
15 setlocale(LC_NUMERIC,"C");
17 if (sscanf(buf, "%lf %lf", &up, &idle) < 2) {
19 setlocale(LC_NUMERIC,savelocale);
22 fputs("bad data in " UPTIME_FILE "\n", stderr);
26 setlocale(LC_NUMERIC,savelocale);
29 SET_IF_DESIRED(uptime_secs, up);
30 SET_IF_DESIRED(idle_secs, idle);
31 return up; /* assume never be zero seconds in practice */
33 double up_1, up_2, seconds;
34 unsigned long long jiffies;
45 wait_j = hirq_j = sirq_j = stol_j = 0;
47 savelocale = strdup(setlocale(LC_NUMERIC, NULL));
48 setlocale(LC_NUMERIC, "C");
51 FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1);
52 /* uptime(&up_1, NULL); */
54 FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2);
55 /* uptime(&up_2, NULL); */
56 } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
58 setlocale(LC_NUMERIC, savelocale);
61 jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ;
62 seconds = (up_1 + up_2) / 2;
63 h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
65 /***********************************************************************/
66 void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
67 double avg_1=0, avg_5=0, avg_15=0;
72 FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
74 savelocale = strdup(setlocale(LC_NUMERIC, NULL));
75 setlocale(LC_NUMERIC, "C");
77 if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) {
78 fputs("bad data in " LOADAVG_FILE "\n", stderr);
85 setlocale(LC_NUMERIC, savelocale);
88 SET_IF_DESIRED(av1, avg_1);
89 SET_IF_DESIRED(av5, avg_5);
90 SET_IF_DESIRED(av15, avg_15);