diff options
Diffstat (limited to 'src/plugins/stats/functions.c')
-rw-r--r-- | src/plugins/stats/functions.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c index 851d544b..5fc11442 100644 --- a/src/plugins/stats/functions.c +++ b/src/plugins/stats/functions.c | |||
@@ -127,16 +127,30 @@ static int getConnectedNodesStat(const void * closure, | |||
127 | return OK; | 127 | return OK; |
128 | } | 128 | } |
129 | 129 | ||
130 | static int getCPULoadStat(const void * closure, | 130 | static int getLoadStat(const void * closure, |
131 | gfloat ** data) { | 131 | gfloat ** data) { |
132 | long long val; | 132 | long long valc; |
133 | long long valu; | ||
134 | long long vald; | ||
133 | 135 | ||
134 | if (OK != getStatValue(&val, | 136 | if (OK != getStatValue(&valc, |
135 | NULL, | 137 | NULL, |
136 | NULL, | 138 | NULL, |
137 | "% of allowed cpu load")) | 139 | "% of allowed cpu load")) |
138 | return SYSERR; | 140 | return SYSERR; |
139 | data[0][0] = (gfloat) val / 100.0; | 141 | if (OK != getStatValue(&valu, |
142 | NULL, | ||
143 | NULL, | ||
144 | "% of allowed network load (up)")) | ||
145 | return SYSERR; | ||
146 | if (OK != getStatValue(&vald, | ||
147 | NULL, | ||
148 | NULL, | ||
149 | "% of allowed network load (down)")) | ||
150 | return SYSERR; | ||
151 | data[0][0] = (gfloat) valc / 100.0; | ||
152 | data[0][1] = (gfloat) valu / 100.0; | ||
153 | data[0][2] = (gfloat) vald / 100.0; | ||
140 | return OK; | 154 | return OK; |
141 | } | 155 | } |
142 | 156 | ||
@@ -479,9 +493,9 @@ StatEntry stats[] = { | |||
479 | NO, | 493 | NO, |
480 | }, | 494 | }, |
481 | { | 495 | { |
482 | gettext_noop("CPU load"), | 496 | gettext_noop("System load"), |
483 | gettext_noop("CPU load (in percent of allowed load)"), | 497 | gettext_noop("CPU load (red), Network upload (green), Network download (yellow)"), |
484 | &getCPULoadStat, | 498 | &getLoadStat, |
485 | NULL, | 499 | NULL, |
486 | 1, | 500 | 1, |
487 | NO, | 501 | NO, |