diff options
Diffstat (limited to 'patches/procps-3.2.7/generic/30_sysinfo_7numbers.dpatch')
-rw-r--r-- | patches/procps-3.2.7/generic/30_sysinfo_7numbers.dpatch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/procps-3.2.7/generic/30_sysinfo_7numbers.dpatch b/patches/procps-3.2.7/generic/30_sysinfo_7numbers.dpatch new file mode 100644 index 000000000..b3c95fb16 --- /dev/null +++ b/patches/procps-3.2.7/generic/30_sysinfo_7numbers.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_sysctl_7numbers.dpatch by <csmall@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds up 7 cpu numbers not 4; #460331 + +@DPATCH@ +diff -urNad procps-3.2.7~/proc/sysinfo.c procps-3.2.7/proc/sysinfo.c +--- procps-3.2.7~/proc/sysinfo.c 2008-08-10 10:13:50.000000000 +1000 ++++ procps-3.2.7/proc/sysinfo.c 2008-08-10 10:13:50.000000000 +1000 +@@ -122,24 +122,25 @@ + unsigned long long Hertz; + + static void old_Hertz_hack(void){ +- unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */ ++ unsigned long long user_j, nice_j, sys_j, other_j, wait_j, hirq_j, sirq_j, stol_j; /* jiffies (clock ticks) */ + double up_1, up_2, seconds; + unsigned long long jiffies; + unsigned h; + char *restrict savelocale; + ++ wait_j = hirq_j = sirq_j = stol_j = 0; + savelocale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); + do{ + FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); + /* uptime(&up_1, NULL); */ + FILE_TO_BUF(STAT_FILE,stat_fd); +- sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j); ++ 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); + 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 */ + setlocale(LC_NUMERIC, savelocale); +- jiffies = user_j + nice_j + sys_j + other_j; ++ 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 ); + /* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */ |