projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-3.11' into collectd-4.0
[collectd.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
0876655
..
22872f0
100644
(file)
--- a/
src/load.c
+++ b/
src/load.c
@@
-23,8
+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
#if defined(HAVE_GETLOADAVG) || defined(KERNEL_LINUX) || defined(HAVE_LIBSTATGRAB)
# define LOAD_HAVE_READ 1
#else
@@
-43,18
+41,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)
{
#if LOAD_HAVE_READ
static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
{
@@
-82,7
+68,11
@@
static int load_read (void)
if (getloadavg (load, 3) == 3)
load_submit (load[LOADAVG_1MIN], load[LOADAVG_5MIN], load[LOADAVG_15MIN]);
else
if (getloadavg (load, 3) == 3)
load_submit (load[LOADAVG_1MIN], load[LOADAVG_5MIN], load[LOADAVG_15MIN]);
else
- syslog (LOG_WARNING, "load: getloadavg failed: %s", strerror (errno));
+ {
+ char errbuf[1024];
+ WARNING ("load: getloadavg failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ }
/* #endif HAVE_GETLOADAVG */
#elif defined(KERNEL_LINUX)
/* #endif HAVE_GETLOADAVG */
#elif defined(KERNEL_LINUX)
@@
-95,24
+85,32
@@
static int load_read (void)
if ((loadavg = fopen ("/proc/loadavg", "r")) == NULL)
{
if ((loadavg = fopen ("/proc/loadavg", "r")) == NULL)
{
- syslog (LOG_WARNING, "load: fopen: %s", strerror (errno));
- return;
+ char errbuf[1024];
+ WARNING ("load: fopen: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
}
if (fgets (buffer, 16, loadavg) == NULL)
{
}
if (fgets (buffer, 16, loadavg) == NULL)
{
- syslog (LOG_WARNING, "load: fgets: %s", strerror (errno));
+ char errbuf[1024];
+ WARNING ("load: fgets: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
fclose (loadavg);
fclose (loadavg);
- return;
+ return
(-1)
;
}
if (fclose (loadavg))
}
if (fclose (loadavg))
- syslog (LOG_WARNING, "load: fclose: %s", strerror (errno));
+ {
+ char errbuf[1024];
+ WARNING ("load: fclose: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ }
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]);
@@
-141,10
+139,7
@@
static int load_read (void)
void module_register (void)
{
void module_register (void)
{
- plugin_register_data_set (&ds);
#if LOAD_HAVE_READ
plugin_register_read ("load", load_read);
#endif
#if LOAD_HAVE_READ
plugin_register_read ("load", load_read);
#endif
-}
-
-#undef MODULE_NAME
+} /* void module_register */