cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synch ksysguardd commands with what ksysguard now expects.

Browse Source
This commit is contained in:
espie 2006-02-18 13:29:36 +00:00
parent da95881fd2
commit b4844a8607
3 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde/base3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2006/02/18 13:07:02 espie Exp $
# $OpenBSD: Makefile,v 1.57 2006/02/18 13:29:36 espie Exp $
COMMENT= "K Desktop Environment, basic applications"
COMMENT-plugins= "Konqueror nsplugins, essentially native JDK"
@ -6,7 +6,7 @@ COMMENT-samba= "K Desktop Environment, samba support"
CATEGORIES= x11 x11/kde
VERSION= 3.5.1
DISTNAME= kdebase-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
PKGNAME-samba= kdesamba-${VERSION}
MODKDE_VERSION?= 3.5
SHARED_LIBS= kasbar 2.0 \

62
x11/kde/base3/patches/patch-ksysguard_ksysguardd_OpenBSD_memory_c Normal file
View File

@ -0,0 +1,62 @@
$OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_memory_c,v 1.1 2006/02/18 13:29:36 espie Exp $
--- ksysguard/ksysguardd/OpenBSD/memory.c.orig Sat Feb 18 14:14:15 2006
+++ ksysguard/ksysguardd/OpenBSD/memory.c Sat Feb 18 14:22:08 2006
@@ -37,6 +37,8 @@
static size_t Total = 0;
static size_t MFree = 0;
+static size_t Used = 0;
+static size_t Application = 0;
static size_t Active = 0;
static size_t InActive = 0;
static size_t STotal = 0;
@@ -71,6 +73,8 @@ initMemory(struct SensorModul* sm)
registerMonitor("mem/physical/free", "integer", printMFree, printMFreeInfo, sm);
registerMonitor("mem/physical/active", "integer", printActive, printActiveInfo, sm);
registerMonitor("mem/physical/inactive", "integer", printInActive, printInActiveInfo, sm);
+ registerMonitor("mem/physical/used", "integer", printUsed, printUsedInfo, sm);
+ registerMonitor("mem/physical/application", "integer", printApplication, printApplicationInfo, sm);
registerMonitor("mem/swap/free", "integer", printSwapFree, printSwapFreeInfo, sm);
registerMonitor("mem/swap/used", "integer", printSwapUsed, printSwapUsedInfo, sm);
}
@@ -99,6 +103,9 @@ updateMemory(void)
InActive /= 1024;
InActive -= Active;
+ Used = Total - MFree;
+ Application = Used;
+
swapmode(&SUsed, &STotal);
SFree = STotal - SUsed;
return 0;
@@ -114,6 +121,30 @@ void
printMFreeInfo(const char* cmd)
{
fprintf(CurrentClient, "Free Memory\t0\t%d\tKB\n", Total);
+}
+
+void
+printUsed(const char* cmd)
+{
+ fprintf(CurrentClient, "%d\n", Used);
+}
+
+void
+printUsedInfo(const char* cmd)
+{
+ fprintf(CurrentClient, "Used Memory\t0\t%d\tKB\n", Total);
+}
+
+void
+printApplication(const char* cmd)
+{
+ fprintf(CurrentClient, "%d\n", Application);
+}
+
+void
+printApplicationInfo(const char* cmd)
+{
+ fprintf(CurrentClient, "Application Memory\t0\t%ld\tKB\n", Total);
}
void

14
x11/kde/base3/patches/patch-ksysguard_ksysguardd_OpenBSD_memory_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_memory_h,v 1.1 2006/02/18 13:29:36 espie Exp $
--- ksysguard/ksysguardd/OpenBSD/memory.h.orig Sat Feb 18 14:25:30 2006
+++ ksysguard/ksysguardd/OpenBSD/memory.h Sat Feb 18 14:26:00 2006
@@ -35,6 +35,10 @@ void printActive(const char* cmd);
void printActiveInfo(const char* cmd);
void printInActive(const char* cmd);
void printInActiveInfo(const char* cmd);
+void printUsed(const char* cmd);
+void printUsedInfo(const char* cmd);
+void printApplication(const char* cmd);
+void printApplicationInfo(const char* cmd);
void printSwapUsed(const char* cmd);
void printSwapUsedInfo(const char* cmd);
void printSwapFree(const char* cmd);