projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snmp plugin: (Hopefully) fix a memory leak.
[collectd.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
b92e54f
..
c9f130b
100644
(file)
--- a/
src/load.c
+++ b/
src/load.c
@@
-1,6
+1,6
@@
/**
* collectd - src/load.c
/**
* collectd - src/load.c
- * Copyright (C) 2005
,2006
Florian octo Forster
+ * Copyright (C) 2005
-2007
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-23,14
+23,6
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#define MODULE_NAME "load"
-
-#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>
#endif
#ifdef HAVE_SYS_LOADAVG_H
#include <sys/loadavg.h>
#endif
@@
-43,19
+35,6
@@
#endif
#endif /* defined(HAVE_GETLOADAVG) */
#endif
#endif /* defined(HAVE_GETLOADAVG) */
-static data_source_t dsrc[3] =
-{
- {"shortterm", DS_TYPE_GAUGE, 0.0, 100.0},
- {"midterm", DS_TYPE_GAUGE, 0.0, 100.0},
- {"longterm", DS_TYPE_GAUGE, 0.0, 100.0}
-};
-
-static data_set_t ds =
-{
- "load", 3, dsrc
-};
-
-#if LOAD_HAVE_READ
static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
{
value_t values[3];
static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
{
value_t values[3];
@@
-102,7
+81,7
@@
static int load_read (void)
char errbuf[1024];
WARNING ("load: fopen: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
char errbuf[1024];
WARNING ("load: fopen: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
- return;
+ return
(-1)
;
}
if (fgets (buffer, 16, loadavg) == NULL)
}
if (fgets (buffer, 16, loadavg) == NULL)
@@
-111,7
+90,7
@@
static int load_read (void)
WARNING ("load: fgets: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
fclose (loadavg);
WARNING ("load: fgets: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
fclose (loadavg);
- return;
+ return
(-1)
;
}
if (fclose (loadavg))
}
if (fclose (loadavg))
@@
-124,7
+103,7
@@
static int load_read (void)
numfields = strsplit (buffer, fields, 8);
if (numfields < 3)
numfields = strsplit (buffer, fields, 8);
if (numfields < 3)
- return;
+ return
(-1)
;
snum = atof (fields[0]);
mnum = atof (fields[1]);
snum = atof (fields[0]);
mnum = atof (fields[1]);
@@
-145,18
+124,16
@@
static int load_read (void)
lnum = ls->min15;
load_submit (snum, mnum, lnum);
lnum = ls->min15;
load_submit (snum, mnum, lnum);
-#endif /* HAVE_LIBSTATGRAB */
+/* #endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
+#endif
return (0);
}
return (0);
}
-#endif /* LOAD_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
- plugin_register_data_set (&ds);
-#if LOAD_HAVE_READ
plugin_register_read ("load", load_read);
plugin_register_read ("load", load_read);
-#endif
-}
-
-#undef MODULE_NAME
+} /* void module_register */