projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't fail if syslog loglevel doesn't match
[collectd.git]
/
src
/
processes.c
diff --git
a/src/processes.c
b/src/processes.c
index
aa7cfa3
..
f83913a
100644
(file)
--- a/
src/processes.c
+++ b/
src/processes.c
@@
-38,12
+38,12
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#if HAVE_LIBTASKSTATS
#if HAVE_LIBTASKSTATS
+#include "utils/taskstats/taskstats.h"
#include "utils_complain.h"
#include "utils_complain.h"
-#include "utils_taskstats.h"
#endif
/* Include header files for the mach system, if they exist.. */
#endif
/* Include header files for the mach system, if they exist.. */
@@
-216,7
+216,7
@@
typedef struct process_entry_s {
typedef struct procstat_entry_s {
unsigned long id;
typedef struct procstat_entry_s {
unsigned long id;
- unsigned
long
age;
+ unsigned
char
age;
derive_t vmem_minflt_counter;
derive_t vmem_majflt_counter;
derive_t vmem_minflt_counter;
derive_t vmem_majflt_counter;
@@
-587,7
+587,8
@@
static void ps_list_add(const char *name, const char *cmdline,
entry->cpu_system_counter);
#if HAVE_LIBTASKSTATS
entry->cpu_system_counter);
#if HAVE_LIBTASKSTATS
- ps_update_delay(ps, pse, entry);
+ if (entry->has_delay)
+ ps_update_delay(ps, pse, entry);
#endif
}
}
#endif
}
}
@@
-616,7
+617,7
@@
static void ps_list_reset(void) {
pse_prev = NULL;
pse = ps->instances;
while (pse != NULL) {
pse_prev = NULL;
pse = ps->instances;
while (pse != NULL) {
- if (pse->age >
1
0) {
+ if (pse->age > 0) {
DEBUG("Removing this procstat entry cause it's too old: "
"id = %lu; name = %s;",
pse->id, ps->name);
DEBUG("Removing this procstat entry cause it's too old: "
"id = %lu; name = %s;",
pse->id, ps->name);
@@
-631,7
+632,7
@@
static void ps_list_reset(void) {
pse = pse_prev->next;
}
} else {
pse = pse_prev->next;
}
} else {
- pse->age
++
;
+ pse->age
= 1
;
pse_prev = pse;
pse = pse->next;
}
pse_prev = pse;
pse = pse->next;
}
@@
-756,7
+757,7
@@
static int ps_init(void) {
pset_list_len = 0;
return -1;
}
pset_list_len = 0;
return -1;
}
-/* #endif HAVE_THREAD_INFO */
+
/* #endif HAVE_THREAD_INFO */
#elif KERNEL_LINUX
pagesize_g = sysconf(_SC_PAGESIZE);
#elif KERNEL_LINUX
pagesize_g = sysconf(_SC_PAGESIZE);
@@
-770,13
+771,13
@@
static int ps_init(void) {
}
}
#endif
}
}
#endif
-/* #endif KERNEL_LINUX */
+
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKVM_GETPROCS && \
(HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
pagesize = getpagesize();
#elif HAVE_LIBKVM_GETPROCS && \
(HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
pagesize = getpagesize();
-/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
+
/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
+
* HAVE_STRUCT_KINFO_PROC_OPENBSD) */
#elif HAVE_PROCINFO_H
pagesize = getpagesize();
#elif HAVE_PROCINFO_H
pagesize = getpagesize();
@@
-1577,7
+1578,6
@@
static char *ps_get_cmdline(long pid,
return NULL;
}
return NULL;
}
- info.pr_psargs[sizeof(info.pr_psargs) - 1] = 0;
sstrncpy(buffer, info.pr_psargs, buffer_size);
return buffer;
sstrncpy(buffer, info.pr_psargs, buffer_size);
return buffer;
@@
-1681,7
+1681,7
@@
static int ps_read_process(long pid, process_entry_t *ps, char *state) {
/*
* TODO: context switch counters for Solaris
/*
* TODO: context switch counters for Solaris
-*/
+
*/
ps->cswitch_vol = -1;
ps->cswitch_invol = -1;
ps->cswitch_vol = -1;
ps->cswitch_invol = -1;
@@
-2013,7
+2013,7
@@
static int ps_read(void) {
for (ps = list_head_g; ps != NULL; ps = ps->next)
ps_submit_proc_list(ps);
for (ps = list_head_g; ps != NULL; ps = ps->next)
ps_submit_proc_list(ps);
-/* #endif HAVE_THREAD_INFO */
+
/* #endif HAVE_THREAD_INFO */
#elif KERNEL_LINUX
int running = 0;
#elif KERNEL_LINUX
int running = 0;
@@
-2095,7
+2095,7
@@
static int ps_read(void) {
ps_submit_proc_list(ps_ptr);
read_fork_rate();
ps_submit_proc_list(ps_ptr);
read_fork_rate();
-/* #endif KERNEL_LINUX */
+
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
int running = 0;
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
int running = 0;
@@
-2250,7
+2250,7
@@
static int ps_read(void) {
for (procstat_t *ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list(ps_ptr);
for (procstat_t *ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list(ps_ptr);
-/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
+
/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_OPENBSD
int running = 0;
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_OPENBSD
int running = 0;
@@
-2394,7
+2394,7
@@
static int ps_read(void) {
for (procstat_t *ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list(ps_ptr);
for (procstat_t *ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list(ps_ptr);
-/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_OPENBSD */
+
/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_OPENBSD */
#elif HAVE_PROCINFO_H
/* AIX */
#elif HAVE_PROCINFO_H
/* AIX */
@@
-2533,7
+2533,7
@@
static int ps_read(void) {
for (procstat_t *ps = list_head_g; ps != NULL; ps = ps->next)
ps_submit_proc_list(ps);
for (procstat_t *ps = list_head_g; ps != NULL; ps = ps->next)
ps_submit_proc_list(ps);
-/* #endif HAVE_PROCINFO_H */
+
/* #endif HAVE_PROCINFO_H */
#elif KERNEL_SOLARIS
/*
#elif KERNEL_SOLARIS
/*