projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the dependency on `cpu.h' since it has been deleted.
[collectd.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
7b3462b
..
fbe6c4d
100644
(file)
--- a/
src/load.c
+++ b/
src/load.c
@@
-20,13
+20,17
@@
* Florian octo Forster <octo at verplant.org>
**/
* Florian octo Forster <octo at verplant.org>
**/
-#include "load.h"
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
-#if COLLECT_LOAD
#define MODULE_NAME "load"
#define MODULE_NAME "load"
-#include "plugin.h"
-#include "common.h"
+#if defined(HAVE_GETLOADAVG) || defined(KERNEL_LINUX) || defined(HAVE_LIBSTATGRAB)
+# define LOAD_HAVE_READ 1
+#else
+# define LOAD_HAVE_READ 0
+#endif
#ifdef HAVE_SYS_LOADAVG_H
#include <sys/loadavg.h>
#ifdef HAVE_SYS_LOADAVG_H
#include <sys/loadavg.h>
@@
-44,27
+48,26
@@
static char *load_file = "load.rrd";
static char *ds_def[] =
{
static char *ds_def[] =
{
- "DS:shortterm:GAUGE:
25
:0:100",
- "DS:midterm:GAUGE:
25
:0:100",
- "DS:longterm:GAUGE:
25
:0:100",
+ "DS:shortterm:GAUGE:
"COLLECTD_HEARTBEAT"
:0:100",
+ "DS:midterm:GAUGE:
"COLLECTD_HEARTBEAT"
:0:100",
+ "DS:longterm:GAUGE:
"COLLECTD_HEARTBEAT"
:0:100",
NULL
};
static int ds_num = 3;
NULL
};
static int ds_num = 3;
-extern time_t curtime;
-
-void load_init (void)
+static void load_init (void)
{
return;
}
{
return;
}
-void load_write (char *host, char *inst, char *val)
+
static
void load_write (char *host, char *inst, char *val)
{
rrd_update_file (host, load_file, val, ds_def, ds_num);
}
{
rrd_update_file (host, load_file, val, ds_def, ds_num);
}
+#if LOAD_HAVE_READ
#define BUFSIZE 256
#define BUFSIZE 256
-void load_submit (double snum, double mnum, double lnum)
+
static
void load_submit (double snum, double mnum, double lnum)
{
char buf[BUFSIZE];
{
char buf[BUFSIZE];
@@
-76,7
+79,7
@@
void load_submit (double snum, double mnum, double lnum)
}
#undef BUFSIZE
}
#undef BUFSIZE
-void load_read (void)
+
static
void load_read (void)
{
#if defined(HAVE_GETLOADAVG)
double load[3];
{
#if defined(HAVE_GETLOADAVG)
double load[3];
@@
-136,6
+139,9
@@
void load_read (void)
load_submit (snum, mnum, lnum);
#endif /* HAVE_LIBSTATGRAB */
}
load_submit (snum, mnum, lnum);
#endif /* HAVE_LIBSTATGRAB */
}
+#else
+# define load_read NULL
+#endif /* LOAD_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
@@
-143,4
+149,3
@@
void module_register (void)
}
#undef MODULE_NAME
}
#undef MODULE_NAME
-#endif /* COLLECT_LOAD */