projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use kern.cp_times sysctl for FreeBSD smp support
[collectd.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
c9f130b
..
cf5221b
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-200
7
Florian octo Forster
+ * Copyright (C) 2005-200
8
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
@@
-19,6
+19,8
@@
* Florian octo Forster <octo at verplant.org>
**/
* Florian octo Forster <octo at verplant.org>
**/
+#define _BSD_SOURCE
+
#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "collectd.h"
#include "common.h"
#include "plugin.h"
@@
-27,6
+29,10
@@
#include <sys/loadavg.h>
#endif
#include <sys/loadavg.h>
#endif
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
#ifdef HAVE_GETLOADAVG
#if !defined(LOADAVG_1MIN) || !defined(LOADAVG_5MIN) || !defined(LOADAVG_15MIN)
#define LOADAVG_1MIN 0
#ifdef HAVE_GETLOADAVG
#if !defined(LOADAVG_1MIN) || !defined(LOADAVG_5MIN) || !defined(LOADAVG_15MIN)
#define LOADAVG_1MIN 0
@@
-46,11
+52,11
@@
static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
vl.values = values;
vl.values_len = STATIC_ARRAY_SIZE (values);
vl.values = values;
vl.values_len = STATIC_ARRAY_SIZE (values);
-
vl.time = time (NULL
);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "load"
);
+
sstrncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "load", sizeof (vl.plugin)
);
+ s
strncpy (vl.type, "load", sizeof (vl.type)
);
- plugin_dispatch_values (
"load",
&vl);
+ plugin_dispatch_values (&vl);
}
static int load_read (void)
}
static int load_read (void)
@@
-112,7
+118,7
@@
static int load_read (void)
load_submit (snum, mnum, lnum);
/* #endif KERNEL_LINUX */
load_submit (snum, mnum, lnum);
/* #endif KERNEL_LINUX */
-#elif
defined(HAVE_LIBSTATGRAB)
+#elif
HAVE_LIBSTATGRAB
gauge_t snum, mnum, lnum;
sg_load_stats *ls;
gauge_t snum, mnum, lnum;
sg_load_stats *ls;