|
Lines 25-42
Link Here
|
| 25 |
#include "sysdep.h" |
25 |
#include "sysdep.h" |
| 26 |
#include "default.h" |
26 |
#include "default.h" |
| 27 |
|
27 |
|
| 28 |
#if defined(linux) |
|
|
| 29 |
//#include <linux/kernel.h> |
| 30 |
#include <sys/sysinfo.h> |
| 31 |
#endif |
| 32 |
#if defined(sun) && defined(SVR4) |
28 |
#if defined(sun) && defined(SVR4) |
| 33 |
#include <sys/loadavg.h> |
29 |
#include <sys/loadavg.h> |
| 34 |
#endif |
30 |
#endif |
| 35 |
#ifdef HAVE_KSTAT_H |
|
|
| 36 |
#include <sys/resource.h> |
| 37 |
#include <kstat.h> |
| 38 |
#include <sys/sysinfo.h> |
| 39 |
#endif |
| 40 |
|
31 |
|
| 41 |
#ifdef HAVE_SYS_PARAM_H |
32 |
#ifdef HAVE_SYS_PARAM_H |
| 42 |
#include <sys/param.h> |
33 |
#include <sys/param.h> |
|
Lines 204-210
bool CPUStatus::handleTimer(YTimer *t) {
Link Here
|
| 204 |
} |
195 |
} |
| 205 |
|
196 |
|
| 206 |
void CPUStatus::updateToolTip() { |
197 |
void CPUStatus::updateToolTip() { |
| 207 |
#ifdef linux |
198 |
#if 0 |
| 208 |
char load[31]; |
199 |
char load[31]; |
| 209 |
struct sysinfo sys; |
200 |
struct sysinfo sys; |
| 210 |
float l1, l5, l15; |
201 |
float l1, l5, l15; |
|
Lines 218-224
void CPUStatus::updateToolTip() {
Link Here
|
| 218 |
char *loadmsg = strJoin(_("CPU Load: "), load, _(" processes."), NULL); |
209 |
char *loadmsg = strJoin(_("CPU Load: "), load, _(" processes."), NULL); |
| 219 |
setToolTip(loadmsg); |
210 |
setToolTip(loadmsg); |
| 220 |
delete [] loadmsg; |
211 |
delete [] loadmsg; |
| 221 |
#elif defined HAVE_GETLOADAVG2 |
212 |
#endif |
|
|
213 |
#if defined HAVE_GETLOADAVG2 |
| 222 |
char load[31]; // enough for "CPU Load: 999.99 999.99 999.99\0" |
214 |
char load[31]; // enough for "CPU Load: 999.99 999.99 999.99\0" |
| 223 |
double loadavg[3]; |
215 |
double loadavg[3]; |
| 224 |
if (getloadavg(loadavg, 3) < 0) |
216 |
if (getloadavg(loadavg, 3) < 0) |
