1f8475f22f
- rework KDE4_BUILDENV
All ports:
- remove needless post-extract target
- make patches relative to ${PATCH_WRKSRC}
- clean up
- bump PORTREVISION when required
databases/akonadi:
- replace dependency on boost-python-libs with boost-libs
(finally, boost-pyhton does not conflict with boost \o/)
deskutils/kdepim*:
- replace boost-python-libs with boost-libs
- reduce dependencies
- respect PREFIX
- fix build with qt3 installed
misc/kdeedu4:
- add dependency on astro/xplanet (for KStars)
misc/kdeutils4:
- add dependency on devel/qca (for okteta)
- make dependency on kdebase non-optional
multimedia/kdemultimedia4:
- add optional support for PulseAudio
x11/kdebase4:
- remove needless dependency on kdebase4-runtime
x11/kdebase4-runtime, x11/kdebase4-workspace
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users
x11/kdelibs4
- remove needless dependencies
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users
77 lines
2.6 KiB
C
77 lines
2.6 KiB
C
--- ./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;
|
|
|
|
-#define CPUSTATES 4
|
|
+#define CPUSTATES 5
|
|
#define CP_USER 0
|
|
#define CP_NICE 1
|
|
#define CP_SYS 2
|
|
-#define CP_IDLE 3
|
|
+#define CP_INTR 3
|
|
+#define CP_IDLE 4
|
|
|
|
#else
|
|
long percentages(int cnt, int *out, long *new, long *old, long *diffs);
|
|
@@ -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 +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 +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);
|
|
+}
|
|
+
|
|
+void
|
|
+printCPUIntrInfo(const char* cmd)
|
|
+{
|
|
+ fprintf(CurrentClient, "CPU Interrupt Load\t0\t100\t%%\n");
|
|
+}
|
|
+
|
|
+void
|
|
printCPUIdle(const char* cmd)
|
|
{
|
|
fprintf(CurrentClient, "%d\n", cpu_states[CP_IDLE]/10);
|
|
@@ -216,7 +246,8 @@
|
|
|
|
out[0] = ((diffs.cp_user * 1000LL + half_total) / total_change);
|
|
out[1] = ((diffs.cp_nice * 1000LL + half_total) / total_change);
|
|
- out[2] = (((diffs.cp_sys + diffs.cp_intr) * 1000LL + half_total) / total_change);
|
|
+ out[2] = ((diffs.cp_sys * 1000LL + half_total) / total_change);
|
|
+ out[3] = ((diffs.cp_intr * 1000LL + half_total) / total_change);
|
|
out[4] = ((diffs.cp_idle * 1000LL + half_total) / total_change);
|
|
}
|
|
#else
|