[Pkg-wmaker-commits] [wmbubble] 37/207: Kill the awful ratelimiting coroutines on system_memory() -- it adds extra complexity for no merit.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 04:17:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbubble.
commit 8d82e997d268448f5b54f37828fa434ca67dfec1
Author: Robert Jacobs <rnjacobs at mit.edu>
Date: Fri Jul 29 13:40:58 2011 -0700
Kill the awful ratelimiting coroutines on system_memory() -- it adds extra complexity for no merit.
---
bubblemon.c | 20 ++++++++------------
include/sys_include.h | 4 +---
sys_freebsd.c | 7 +++----
sys_linux.c | 12 +-----------
sys_netbsd.c | 4 +---
sys_openbsd.c | 4 +---
sys_sunos.c | 9 +--------
7 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/bubblemon.c b/bubblemon.c
index 8b03128..6b610a0 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -1319,17 +1319,13 @@ static void bubblemon_allocate_buffers(void) {
}
static void get_memory_load_percentage(void) {
- /* system_memory() will return true on initial run so that we get
- * correct memory info, but may subsequently return 0 if memory
- * is not changing */
- if (system_memory()) {
- /* new memory/swap data is in, calculate things */
- bm.mem_percent = (100 * bm.mem_used) / bm.mem_max;
-
- if (bm.swap_max != 0) {
- bm.swap_percent = (100 * bm.swap_used) / bm.swap_max;
- } else {
- bm.swap_percent = 0;
- }
+ system_memory();
+ /* new memory/swap data is in, calculate things */
+ bm.mem_percent = (100 * bm.mem_used) / bm.mem_max;
+
+ if (bm.swap_max != 0) {
+ bm.swap_percent = (100 * bm.swap_used) / bm.swap_max;
+ } else {
+ bm.swap_percent = 0;
}
}
diff --git a/include/sys_include.h b/include/sys_include.h
index aba74db..8e96773 100644
--- a/include/sys_include.h
+++ b/include/sys_include.h
@@ -21,9 +21,7 @@
/* these routines must be written for each new platform */
int system_cpu(void); /* return total CPU load in percent */
-int system_memory(void); /* set memory related values in BubbleMonData
- and return 1, or return 0 if memory didn't
- change */
+void system_memory(void); /* set memory related values in BubbleMonData */
void system_loadavg(void); /* get current load average and put into
bm->loadavg[].{i,f} */
#endif /* _SYS_INCLUDE_H_ */
diff --git a/sys_freebsd.c b/sys_freebsd.c
index 48d70cd..fbfc4fd 100644
--- a/sys_freebsd.c
+++ b/sys_freebsd.c
@@ -120,7 +120,7 @@ int system_cpu(void)
return loadPercentage;
}
-int system_memory(void)
+void system_memory(void)
{
u_int64_t my_mem_used, my_mem_max;
u_int64_t my_swap_used, my_swap_max;
@@ -134,11 +134,11 @@ int system_memory(void)
time_t curr_time;
if (kvm_read(kd, nlst[1].n_value, &sum, sizeof(sum)) != sizeof(sum))
- return 0; /* _cnt */
+ return; /* _cnt */
if (kvm_read(kd, nlst[2].n_value, &bufspace, sizeof(bufspace)) !=
sizeof(bufspace))
- return 0; /* _bufspace */
+ return; /* _bufspace */
my_mem_max = pagetob((u_int64_t) sum.v_page_count);
my_mem_used = pagetob((u_int64_t) sum.v_active_count);
@@ -178,7 +178,6 @@ int system_memory(void)
bm.mem_max = my_mem_max;
bm.swap_used = my_swap_used;
bm.swap_max = my_swap_max;
- return 1;
}
void system_loadavg(void)
diff --git a/sys_linux.c b/sys_linux.c
index d64180d..6c6e741 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -101,13 +101,12 @@ int system_cpu(void)
return cpuload;
}
-int system_memory(void)
+void system_memory(void)
{
u_int64_t my_mem_used, my_mem_max;
u_int64_t my_swap_used, my_swap_max;
char *p;
- static int mem_delay = 0;
FILE *mem;
static u_int64_t aa, ab, ac, ad;
static u_int64_t ae, af, ag, ah;
@@ -117,7 +116,6 @@ int system_memory(void)
/* we might as well get both swap and memory at the same time.
* sure beats opening the same file twice */
- if (mem_delay-- <= 0) {
if (ver == LINUX_2_6) {
mem = fopen("/proc/meminfo", "r");
memset(shit, 0, sizeof(shit));
@@ -151,7 +149,6 @@ int system_memory(void)
}
}
fclose(mem);
- mem_delay = 25;
} else if (ver == LINUX_2_4) {
mem = fopen("/proc/meminfo", "r");
fgets(shit, 2048, mem);
@@ -160,7 +157,6 @@ int system_memory(void)
&ad, &ae, &af);
fscanf(mem, "%*s %Ld %Ld", &ag, &ah);
fclose(mem);
- mem_delay = 25;
/* calculate it */
my_mem_max = aa; /* memory.total; */
@@ -180,12 +176,6 @@ int system_memory(void)
bm.swap_used = my_swap_used;
bm.swap_max = my_swap_max;
}
-
- /* memory info changed - update things */
- return 1;
- }
- /* nothing new */
- return 0;
}
void system_loadavg(void)
diff --git a/sys_netbsd.c b/sys_netbsd.c
index 777ba0a..a9222b6 100644
--- a/sys_netbsd.c
+++ b/sys_netbsd.c
@@ -75,7 +75,7 @@ int system_cpu(void)
return loadPercentage;
}
-int system_memory(void)
+void system_memory(void)
{
#define pagetob(size) ((size) << (uvmexp.pageshift))
struct uvmexp uvmexp;
@@ -102,8 +102,6 @@ int system_memory(void)
}
free(swdev);
}
-
- return 1;
}
void system_loadavg(void)
diff --git a/sys_openbsd.c b/sys_openbsd.c
index 3112851..1cd9427 100644
--- a/sys_openbsd.c
+++ b/sys_openbsd.c
@@ -73,7 +73,7 @@ int system_cpu(void)
return loadPercentage;
}
-int system_memory(void)
+void system_memory(void)
{
#define pagetob(size) ((size) << (uvmexp.pageshift))
struct uvmexp uvmexp;
@@ -100,8 +100,6 @@ int system_memory(void)
}
free(swdev);
}
-
- return 1;
}
void system_loadavg(void)
diff --git a/sys_sunos.c b/sys_sunos.c
index 5d1c4c9..37c1934 100644
--- a/sys_sunos.c
+++ b/sys_sunos.c
@@ -173,9 +173,8 @@ typedef struct TMyMem {
u_int64_t lSwapFree;
} MyMem;
-int system_memory(void)
+void system_memory(void)
{
- static MyMem last = { 100, 20, 200, 10, };
MyMem cur = { 100, 20, 200, 10, };
int rc = 0;
@@ -205,12 +204,6 @@ int system_memory(void)
}
i++;
}
-
- /* if memory info changed - update things */
- rc = (0 == memcmp(&last, &cur, sizeof(last)) ? 0 : 1);
-
- memcpy(&last, &cur, sizeof(last));
- return rc;
}
void system_loadavg(void)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git
More information about the Pkg-wmaker-commits
mailing list