author | Marc Fournier <marc.fournier@camptocamp.com> | |
Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200) |
configure.ac | patch | blob | history | |
src/collectd.conf.pod | patch | blob | history | |
src/ipc.c | patch | blob | history | |
src/routeros.c | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index 9c2f32af8177089ee95cbaedf051cf10fcc5d2f1..8129468a1f7dc538d020c3063a13a42a24350a9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# }}} --with-python
# --with-librabbitmq {{{
-with_librabbitmq_cppflags="-I/usr/local/include"
-with_librabbitmq_ldflags="-L/usr/local/lib"
+with_librabbitmq_cppflags=""
+with_librabbitmq_ldflags=""
AC_ARG_WITH(librabbitmq, [AS_HELP_STRING([--with-librabbitmq@<:@=PREFIX@:>@], [Path to librabbitmq.])],
[
if test "x$withval" != "xno" && test "x$withval" != "xyes"
plugin_drbd="no"
plugin_entropy="no"
plugin_ethstat="no"
+plugin_fhcount="no"
plugin_fscache="no"
plugin_interface="no"
plugin_ipmi="no"
plugin_disk="yes"
plugin_drbd="yes"
plugin_entropy="yes"
+ plugin_fhcount="yes"
plugin_fscache="yes"
plugin_interface="yes"
plugin_ipc="yes"
AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics])
AC_PLUGIN([ethstat], [$plugin_ethstat], [Stats from NIC driver])
AC_PLUGIN([exec], [yes], [Execution of external programs])
-AC_PLUGIN([fhcount], [yes], [File handles statistics])
+AC_PLUGIN([fhcount], [$plugin_fhcount], [File handles statistics])
AC_PLUGIN([filecount], [yes], [Count files in directories])
AC_PLUGIN([fscache], [$plugin_fscache], [fscache statistics])
AC_PLUGIN([gmond], [$with_libganglia], [Ganglia plugin])
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index bd39295e54deac93f7b5aff5ff5dd4135542a487..aaeeaf419b703913392ef5e78448ffa76fc451dc 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2288,7 +2288,7 @@ expected from them. This is documented in great detail in L<collectd-exec(5)>.
=head2 Plugin C<fhcount>
The C<fhcount> plugin provides statistics about used, unused and total number of
-file handles.
+file handles on Linux.
The I<fhcount plugin> provides the following configuration options:
diff --git a/src/ipc.c b/src/ipc.c
index 3763f24837addb2a9b2f523093a49b745119cb78..b4038472efb76e4ff48df62e95b91307a8ff2dfc 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
#include "configfile.h"
#if KERNEL_LINUX
+ /* _GNU_SOURCE is needed for struct shm_info.used_ids on musl libc */
+# define _GNU_SOURCE
+
/* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
/* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
/* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */
diff --git a/src/routeros.c b/src/routeros.c
index 400ee42b64fcd294106f8681dfee3d3d9e77a0d1..667c2fa581722e00ef01161e385d6e13d0c4e36a 100644 (file)
--- a/src/routeros.c
+++ b/src/routeros.c
router_data = malloc (sizeof (*router_data));
if (router_data == NULL)
return (-1);
- memset (router_data, 0, sizeof (router_data));
+ memset (router_data, 0, sizeof (*router_data));
router_data->connection = NULL;
router_data->node = NULL;
router_data->service = NULL;