From: Marc Fournier Date: Sun, 28 Feb 2016 00:12:42 +0000 (+0100) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.2~60 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=6258e772d808f4e76ea8e23d9e2750cfc7e6c60d;hp=d3f8bb573b981294a614a25fc425f8cf97390275 Merge branch 'collectd-5.4' into collectd-5.5 --- diff --git a/configure.ac b/configure.ac index ee6300a0..9112a91f 100644 --- a/configure.ac +++ b/configure.ac @@ -68,9 +68,9 @@ AC_CACHE_CHECK([if bison is the parser generator], )] ) -if test "x$collectd_cv_prog_bison" = "xno" && test ! -f "${srcdir}/liboconfig/parser.c" +if test "x$collectd_cv_prog_bison" = "xno" && test ! -f "${srcdir}/src/liboconfig/parser.c" then - AC_MSG_ERROR([bison is missing and you do not have ${srcdir}/liboconfig/parser.c. Please install bison]) + AC_MSG_ERROR([bison is missing and you do not have ${srcdir}/src/liboconfig/parser.c. Please install bison]) fi AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no]) diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 7407dc8d..73da03d0 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -2054,9 +2054,9 @@ fi %{_includedir}/collectd/network_buffer.h %{_includedir}/collectd/lcc_features.h %{_libdir}/pkgconfig/libcollectdclient.pc +%{_libdir}/libcollectdclient.so %files -n libcollectdclient -%{_libdir}/libcollectdclient.so %{_libdir}/libcollectdclient.so.* %files -n collectd-utils diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index 0eabec7f..56bab99a 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -2504,7 +2504,7 @@ a more detailed description see B below. =item B I|I -If no configuration if given, the B-plugin will collect data from +If no configuration if given, the B-plugin will collect data from all interfaces. This may not be practical, especially for loopback- and similar interfaces. Thus, you can use the B-option to pick the interfaces you're interested in. Sometimes, however, it's easier/preferred diff --git a/src/processes.c b/src/processes.c index 2d79c7f6..8f94fc25 100644 --- a/src/processes.c +++ b/src/processes.c @@ -781,14 +781,14 @@ static void ps_submit_fork_rate (derive_t value) /* ------- additional functions for KERNEL_LINUX/HAVE_THREAD_INFO ------- */ #if KERNEL_LINUX -static int ps_read_tasks (int pid) +static int ps_read_tasks (long pid) { char dirname[64]; DIR *dh; struct dirent *ent; int count = 0; - ssnprintf (dirname, sizeof (dirname), "/proc/%i/task", pid); + ssnprintf (dirname, sizeof (dirname), "/proc/%li/task", pid); if ((dh = opendir (dirname)) == NULL) { @@ -809,7 +809,7 @@ static int ps_read_tasks (int pid) } /* int *ps_read_tasks */ /* Read advanced virtual memory data from /proc/pid/status */ -static procstat_t *ps_read_vmem (int pid, procstat_t *ps) +static procstat_t *ps_read_vmem (long pid, procstat_t *ps) { FILE *fh; char buffer[1024]; @@ -820,7 +820,7 @@ static procstat_t *ps_read_vmem (int pid, procstat_t *ps) char *fields[8]; int numfields; - ssnprintf (filename, sizeof (filename), "/proc/%i/status", pid); + ssnprintf (filename, sizeof (filename), "/proc/%li/status", pid); if ((fh = fopen (filename, "r")) == NULL) return (NULL); @@ -871,7 +871,7 @@ static procstat_t *ps_read_vmem (int pid, procstat_t *ps) return (ps); } /* procstat_t *ps_read_vmem */ -static procstat_t *ps_read_io (int pid, procstat_t *ps) +static procstat_t *ps_read_io (long pid, procstat_t *ps) { FILE *fh; char buffer[1024]; @@ -880,7 +880,7 @@ static procstat_t *ps_read_io (int pid, procstat_t *ps) char *fields[8]; int numfields; - ssnprintf (filename, sizeof (filename), "/proc/%i/io", pid); + ssnprintf (filename, sizeof (filename), "/proc/%li/io", pid); if ((fh = fopen (filename, "r")) == NULL) return (NULL); @@ -926,7 +926,7 @@ static procstat_t *ps_read_io (int pid, procstat_t *ps) return (ps); } /* procstat_t *ps_read_io */ -int ps_read_process (int pid, procstat_t *ps, char *state) +int ps_read_process (long pid, procstat_t *ps, char *state) { char filename[64]; char buffer[1024]; @@ -949,7 +949,7 @@ int ps_read_process (int pid, procstat_t *ps, char *state) memset (ps, 0, sizeof (procstat_t)); - ssnprintf (filename, sizeof (filename), "/proc/%i/stat", pid); + ssnprintf (filename, sizeof (filename), "/proc/%li/stat", pid); buffer_len = read_file_contents (filename, buffer, sizeof(buffer) - 1); @@ -994,9 +994,9 @@ int ps_read_process (int pid, procstat_t *ps, char *state) fields_len = strsplit (buffer_ptr, fields, STATIC_ARRAY_SIZE (fields)); if (fields_len < 22) { - DEBUG ("processes plugin: ps_read_process (pid = %i):" + DEBUG ("processes plugin: ps_read_process (pid = %li):" " `%s' has only %i fields..", - (int) pid, filename, fields_len); + pid, filename, fields_len); return (-1); } @@ -1020,7 +1020,7 @@ int ps_read_process (int pid, procstat_t *ps, char *state) /* Leave the rest at zero if this is only a zombi */ if (ps->num_proc == 0) { - DEBUG ("processes plugin: This is only a zombie: pid = %i; " + DEBUG ("processes plugin: This is only a zombie: pid = %li; " "name = %s;", pid, ps->name); return (0); } @@ -1068,14 +1068,14 @@ int ps_read_process (int pid, procstat_t *ps, char *state) ps->io_syscr = -1; ps->io_syscw = -1; - DEBUG("ps_read_process: not get io data for pid %i",pid); + DEBUG("ps_read_process: not get io data for pid %li", pid); } /* success */ return (0); } /* int ps_read_process (...) */ -static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len) +static char *ps_get_cmdline (long pid, char *name, char *buf, size_t buf_len) { char *buf_ptr; size_t len; @@ -1088,8 +1088,7 @@ static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len) if ((pid < 1) || (NULL == buf) || (buf_len < 2)) return NULL; - ssnprintf (file, sizeof (file), "/proc/%u/cmdline", - (unsigned int) pid); + ssnprintf (file, sizeof (file), "/proc/%li/cmdline", pid); errno = 0; fd = open (file, O_RDONLY); @@ -1217,7 +1216,7 @@ static int read_fork_rate () #endif /*KERNEL_LINUX */ #if KERNEL_SOLARIS -static char *ps_get_cmdline (pid_t pid, char *name __attribute__((unused)), /* {{{ */ +static char *ps_get_cmdline (long pid, char *name __attribute__((unused)), /* {{{ */ char *buffer, size_t buffer_size) { char path[PATH_MAX]; @@ -1706,7 +1705,7 @@ static int ps_read (void) struct dirent *ent; DIR *proc; - int pid; + long pid; char cmdline[CMDLINE_BUFFER_SIZE]; @@ -1733,7 +1732,7 @@ static int ps_read (void) if (!isdigit (ent->d_name[0])) continue; - if ((pid = atoi (ent->d_name)) < 1) + if ((pid = atol (ent->d_name)) < 1) continue; status = ps_read_process (pid, &ps, &state);