X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=261accbcbc7582218c6f5744cb818beba533ffe8;hb=7e1ee1bc185e7638d6dbd643ff61bce340829bc6;hp=f4ffef8f67ed49a2ddb459e95cce8ad154aa49f9;hpb=02ea8fa749d3225f2e4dbb7e00198abc3990e523;p=collectd.git diff --git a/src/processes.c b/src/processes.c index f4ffef8f..261accbc 100644 --- a/src/processes.c +++ b/src/processes.c @@ -1,8 +1,9 @@ /** * collectd - src/processes.c - * Copyright (C) 2005 Lyonel Vincent - * Copyright (C) 2006-2008 Florian Forster (Mach code) - * Copyright (C) 2008 Oleg King + * Copyright (C) 2005 Lyonel Vincent + * Copyright (C) 2006-2008 Florian octo Forster + * Copyright (C) 2008 Oleg King + * Copyright (C) 2009 Sebastian Harl * * 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 @@ -85,14 +86,13 @@ # endif /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKVM_GETPROCS +#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD # include +# include +# include # include # include -# if HAVE_SYS_SYSCTL_H -# include -# endif -/* #endif HAVE_LIBKVM_GETPROCS */ +/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */ #else # error "No applicable input method." @@ -102,6 +102,10 @@ # include #endif +#ifndef ARG_MAX +# define ARG_MAX 4096 +#endif + #define BUFSIZE 256 static const char *config_keys[] = @@ -118,7 +122,9 @@ typedef struct procstat_entry_s unsigned long num_proc; unsigned long num_lwp; + unsigned long vmem_size; unsigned long vmem_rss; + unsigned long stack_size; unsigned long vmem_minflt; unsigned long vmem_majflt; @@ -143,7 +149,9 @@ typedef struct procstat unsigned long num_proc; unsigned long num_lwp; + unsigned long vmem_size; unsigned long vmem_rss; + unsigned long stack_size; unsigned long vmem_minflt_counter; unsigned long vmem_majflt_counter; @@ -169,9 +177,9 @@ static mach_msg_type_number_t pset_list_len; static long pagesize_g; /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKVM_GETPROCS +#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD /* no global variables */ -#endif /* HAVE_LIBKVM_GETPROCS */ +#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */ /* put name of process from config to list_head_g tree list_head_g is a list of 'procstat_t' structs with @@ -315,13 +323,17 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t } pse->age = 0; - pse->num_proc = entry->num_proc; - pse->num_lwp = entry->num_lwp; - pse->vmem_rss = entry->vmem_rss; - - ps->num_proc += pse->num_proc; - ps->num_lwp += pse->num_lwp; - ps->vmem_rss += pse->vmem_rss; + pse->num_proc = entry->num_proc; + pse->num_lwp = entry->num_lwp; + pse->vmem_size = entry->vmem_size; + pse->vmem_rss = entry->vmem_rss; + pse->stack_size = entry->stack_size; + + ps->num_proc += pse->num_proc; + ps->num_lwp += pse->num_lwp; + ps->vmem_size += pse->vmem_size; + ps->vmem_rss += pse->vmem_rss; + ps->stack_size += pse->stack_size; if ((entry->vmem_minflt_counter == 0) && (entry->vmem_majflt_counter == 0)) @@ -410,7 +422,9 @@ static void ps_list_reset (void) { ps->num_proc = 0; ps->num_lwp = 0; + ps->vmem_size = 0; ps->vmem_rss = 0; + ps->stack_size = 0; pse_prev = NULL; pse = ps->instances; @@ -522,9 +536,9 @@ static int ps_init (void) pagesize_g, CONFIG_HZ); /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKVM_GETPROCS +#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD /* no initialization */ -#endif /* HAVE_LIBKVM_GETPROCS */ +#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */ return (0); } /* int ps_init */ @@ -539,7 +553,6 @@ static void ps_submit_state (const char *state, double value) vl.values = values; vl.values_len = 1; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "processes", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance)); @@ -557,16 +570,25 @@ static void ps_submit_proc_list (procstat_t *ps) vl.values = values; vl.values_len = 2; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "processes", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, ps->name, sizeof (vl.plugin_instance)); + sstrncpy (vl.type, "ps_vm", sizeof (vl.type)); + vl.values[0].gauge = ps->vmem_size; + vl.values_len = 1; + plugin_dispatch_values (&vl); + sstrncpy (vl.type, "ps_rss", sizeof (vl.type)); vl.values[0].gauge = ps->vmem_rss; vl.values_len = 1; plugin_dispatch_values (&vl); + sstrncpy (vl.type, "ps_stacksize", sizeof (vl.type)); + vl.values[0].gauge = ps->stack_size; + vl.values_len = 1; + plugin_dispatch_values (&vl); + sstrncpy (vl.type, "ps_cputime", sizeof (vl.type)); vl.values[0].counter = ps->cpu_user_counter; vl.values[1].counter = ps->cpu_system_counter; @@ -672,7 +694,9 @@ int ps_read_process (int pid, procstat_t *ps, char *state) long long unsigned cpu_user_counter; long long unsigned cpu_system_counter; + long long unsigned vmem_size; long long unsigned vmem_rss; + long long unsigned stack_size; memset (ps, 0, sizeof (procstat_t)); @@ -739,10 +763,20 @@ int ps_read_process (int pid, procstat_t *ps, char *state) cpu_user_counter = atoll (fields[13]); cpu_system_counter = atoll (fields[14]); - vmem_rss = atoll (fields[23]); + vmem_size = atoll (fields[22]); + vmem_rss = atoll (fields[23]); ps->vmem_minflt_counter = atol (fields[9]); ps->vmem_majflt_counter = atol (fields[11]); - + + { + unsigned long long stack_start = atoll (fields[27]); + unsigned long long stack_ptr = atoll (fields[28]); + + stack_size = (stack_start > stack_ptr) + ? stack_start - stack_ptr + : stack_ptr - stack_start; + } + /* Convert jiffies to useconds */ cpu_user_counter = cpu_user_counter * 1000000 / CONFIG_HZ; cpu_system_counter = cpu_system_counter * 1000000 / CONFIG_HZ; @@ -750,7 +784,9 @@ int ps_read_process (int pid, procstat_t *ps, char *state) ps->cpu_user_counter = (unsigned long) cpu_user_counter; ps->cpu_system_counter = (unsigned long) cpu_system_counter; + ps->vmem_size = (unsigned long) vmem_size; ps->vmem_rss = (unsigned long) vmem_rss; + ps->stack_size = (unsigned long) stack_size; /* success */ return (0); @@ -785,7 +821,7 @@ static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len) n = 0; while (42) { - size_t status; + ssize_t status; status = read (fd, (void *)buf_ptr, len); @@ -1198,9 +1234,11 @@ static int ps_read (void) pse.id = pid; pse.age = 0; - pse.num_proc = ps.num_proc; - pse.num_lwp = ps.num_lwp; - pse.vmem_rss = ps.vmem_rss; + pse.num_proc = ps.num_proc; + pse.num_lwp = ps.num_lwp; + pse.vmem_size = ps.vmem_size; + pse.vmem_rss = ps.vmem_rss; + pse.stack_size = ps.stack_size; pse.vmem_minflt = 0; pse.vmem_minflt_counter = ps.vmem_minflt_counter; @@ -1240,7 +1278,7 @@ static int ps_read (void) ps_submit_proc_list (ps_ptr); /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKVM_GETPROCS +#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD int running = 0; int sleeping = 0; int zombies = 0; @@ -1319,7 +1357,9 @@ static int ps_read (void) pse.num_proc = 1; pse.num_lwp = procs[i].ki_numthreads; + pse.vmem_size = procs[i].ki_size; pse.vmem_rss = procs[i].ki_rssize * getpagesize(); + pse.stack_size = procs[i].ki_ssize * getpagesize(); pse.vmem_minflt = 0; pse.vmem_minflt_counter = procs[i].ki_rusage.ru_minflt; pse.vmem_majflt = 0; @@ -1360,7 +1400,7 @@ static int ps_read (void) for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next) ps_submit_proc_list (ps_ptr); -#endif /* HAVE_LIBKVM_GETPROCS */ +#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */ return (0); } /* int ps_read */