summaryrefslogtreecommitdiff
path: root/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
index 23f3252cabac..978857c88f17 100644
--- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
+++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
@@ -1,5 +1,5 @@
---- ../ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2008-04-15 04:26:36.000000000 +0200
-+++ ../ksysguard/ksysguardd/FreeBSD/CPU.c 2008-04-15 04:39:27.000000000 +0200
+--- ../ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2008-01-05 00:55:46.000000000 +0100
++++ ../ksysguard/ksysguardd/FreeBSD/CPU.c 2009-02-03 20:54:08.000000000 +0100
@@ -49,11 +49,12 @@
struct kinfo_cputime *);
static struct kinfo_cputime cp_time, cp_old;
@@ -15,26 +15,41 @@
#else
long percentages(int cnt, int *out, long *new, long *old, long *diffs);
-@@ -74,6 +75,7 @@
+@@ -74,6 +75,8 @@
registerMonitor("cpu/system/user", "integer", printCPUUser, printCPUUserInfo, sm);
registerMonitor("cpu/system/nice", "integer", printCPUNice, printCPUNiceInfo, sm);
registerMonitor("cpu/system/sys", "integer", printCPUSys, printCPUSysInfo, sm);
++ registerMonitor("cpu/system/TotalLoad", "float", printCPUTotalLoad, printCPUTotalLoadInfo, sm);
+ registerMonitor("cpu/system/intr", "integer", printCPUIntr, printCPUIntrInfo, sm);
registerMonitor("cpu/system/idle", "integer", printCPUIdle, printCPUIdleInfo, sm);
/* Monitor names changed from kde3 => kde4. Remain compatible with legacy requests when possible. */
-@@ -91,6 +93,7 @@
+@@ -91,6 +94,8 @@
removeMonitor("cpu/system/user");
removeMonitor("cpu/system/nice");
removeMonitor("cpu/system/sys");
++ removeMonitor("cpu/system/TotalLoad");
+ removeMonitor("cpu/system/intr");
removeMonitor("cpu/system/idle");
/* These were registered as legacy monitors */
-@@ -151,6 +154,18 @@
+@@ -151,6 +156,31 @@
}
void
++printCPUTotalLoad(const char* cmd)
++{
++ fprintf(CurrentClient, "%f\n", (cpu_states[CP_SYS] + cpu_states[CP_USER] +
++ cpu_states[CP_NICE] + cpu_states[CP_INTR]) / 10.0);
++}
++
++void
++printCPUTotalLoadInfo(const char* cmd)
++{
++ fprintf(CurrentClient, "CPU Total Load\t0\t100\t%%\n");
++}
++
++void
+printCPUIntr(const char* cmd)
+{
+ fprintf(CurrentClient, "%d\n", cpu_states[CP_INTR]/10);
@@ -50,7 +65,7 @@
printCPUIdle(const char* cmd)
{
fprintf(CurrentClient, "%d\n", cpu_states[CP_IDLE]/10);
-@@ -216,7 +231,8 @@
+@@ -216,7 +246,8 @@
out[0] = ((diffs.cp_user * 1000LL + half_total) / total_change);
out[1] = ((diffs.cp_nice * 1000LL + half_total) / total_change);