|
Lines 122-145
Link Here
|
| 122 |
unsigned long long Hertz; |
122 |
unsigned long long Hertz; |
| 123 |
|
123 |
|
| 124 |
static void old_Hertz_hack(void){ |
124 |
static void old_Hertz_hack(void){ |
| 125 |
unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */ |
125 |
unsigned long long user_j, nice_j, sys_j, other_j, wait_j, hirq_j, sirq_j, stol_j; /* jiffies (clock ticks) */ |
| 126 |
double up_1, up_2, seconds; |
126 |
double up_1, up_2, seconds; |
| 127 |
unsigned long long jiffies; |
127 |
unsigned long long jiffies; |
| 128 |
unsigned h; |
128 |
unsigned h; |
| 129 |
char *restrict savelocale; |
129 |
char *restrict savelocale; |
| 130 |
|
130 |
|
|
|
131 |
wait_j = hirq_j = sirq_j = stol_j = 0; |
| 131 |
savelocale = setlocale(LC_NUMERIC, NULL); |
132 |
savelocale = setlocale(LC_NUMERIC, NULL); |
| 132 |
setlocale(LC_NUMERIC, "C"); |
133 |
setlocale(LC_NUMERIC, "C"); |
| 133 |
do{ |
134 |
do{ |
| 134 |
FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); |
135 |
FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); |
| 135 |
/* uptime(&up_1, NULL); */ |
136 |
/* uptime(&up_1, NULL); */ |
| 136 |
FILE_TO_BUF(STAT_FILE,stat_fd); |
137 |
FILE_TO_BUF(STAT_FILE,stat_fd); |
| 137 |
sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j); |
138 |
sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j, &wait_j, &hirq_j, &sirq_j, &stol_j); |
| 138 |
FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2); |
139 |
FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2); |
| 139 |
/* uptime(&up_2, NULL); */ |
140 |
/* uptime(&up_2, NULL); */ |
| 140 |
} while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ |
141 |
} while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ |
| 141 |
setlocale(LC_NUMERIC, savelocale); |
142 |
setlocale(LC_NUMERIC, savelocale); |
| 142 |
jiffies = user_j + nice_j + sys_j + other_j; |
143 |
jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ; |
| 143 |
seconds = (up_1 + up_2) / 2; |
144 |
seconds = (up_1 + up_2) / 2; |
| 144 |
h = (unsigned)( (double)jiffies/seconds/smp_num_cpus ); |
145 |
h = (unsigned)( (double)jiffies/seconds/smp_num_cpus ); |
| 145 |
/* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */ |
146 |
/* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */ |
|
Lines 218-229
Link Here
|
| 218 |
// _SC_NPROCESSORS_ONLN returns 1, which should work OK |
219 |
// _SC_NPROCESSORS_ONLN returns 1, which should work OK |
| 219 |
smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN); |
220 |
smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN); |
| 220 |
if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */ |
221 |
if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */ |
| 221 |
|
222 |
#ifdef __linux__ |
| 222 |
if(linux_version_code > LINUX_VERSION(2, 4, 0)){ |
223 |
if(linux_version_code > LINUX_VERSION(2, 4, 0)){ |
| 223 |
Hertz = find_elf_note(AT_CLKTCK); |
224 |
Hertz = find_elf_note(AT_CLKTCK); |
| 224 |
if(Hertz!=NOTE_NOT_FOUND) return; |
225 |
if(Hertz!=NOTE_NOT_FOUND) return; |
| 225 |
fputs("2.4+ kernel w/o ELF notes? -- report this\n", stderr); |
226 |
fputs("2.4+ kernel w/o ELF notes? -- report this\n", stderr); |
| 226 |
} |
227 |
} |
|
|
228 |
#endif |
| 227 |
old_Hertz_hack(); |
229 |
old_Hertz_hack(); |
| 228 |
} |
230 |
} |
| 229 |
|
231 |
|
