X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=fd06b21b4949d88cff169806d01abee98720ce03;hb=9a9d3f9ca9e26aa0dd3eb61a75a0729b915190a1;hp=4fb70ade91636a2b62db708b25c5e5424c3041d5;hpb=f560c943439ba28e74eb576eb58a965d049588f9;p=collectd.git diff --git a/src/processes.c b/src/processes.c index 4fb70ade..fd06b21b 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,13 +102,16 @@ # include #endif +#ifndef ARG_MAX +# define ARG_MAX 4096 +#endif + #define BUFSIZE 256 static const char *config_keys[] = { "Process", - "ProcessMatch", - NULL + "ProcessMatch" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -119,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; @@ -144,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; @@ -170,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 @@ -316,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)) @@ -411,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; @@ -523,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 */ @@ -540,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)); @@ -558,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; @@ -596,65 +617,31 @@ static void ps_submit_proc_list (procstat_t *ps) /* ------- additional functions for KERNEL_LINUX/HAVE_THREAD_INFO ------- */ #if KERNEL_LINUX -static int *ps_read_tasks (int pid) +static int ps_read_tasks (int pid) { - int *list = NULL; - int list_size = 1; /* size of allocated space, in elements */ - int list_len = 0; /* number of currently used elements */ - char dirname[64]; DIR *dh; struct dirent *ent; + int count = 0; ssnprintf (dirname, sizeof (dirname), "/proc/%i/task", pid); if ((dh = opendir (dirname)) == NULL) { DEBUG ("Failed to open directory `%s'", dirname); - return (NULL); + return (-1); } while ((ent = readdir (dh)) != NULL) { - if (!isdigit (ent->d_name[0])) + if (!isdigit ((int) ent->d_name[0])) continue; - - if ((list_len + 1) >= list_size) - { - int *new_ptr; - int new_size = 2 * list_size; - /* Comes in sizes: 2, 4, 8, 16, ... */ - - new_ptr = (int *) realloc (list, (size_t) (sizeof (int) * new_size)); - if (new_ptr == NULL) - { - if (list != NULL) - free (list); - ERROR ("processes plugin: " - "Failed to allocate more memory."); - return (NULL); - } - - list = new_ptr; - list_size = new_size; - - memset (list + list_len, 0, sizeof (int) * (list_size - list_len)); - } - - list[list_len] = atoi (ent->d_name); - if (list[list_len] != 0) - list_len++; + else + count++; } - closedir (dh); - if (list_len == 0) - return (NULL); - - assert (list_len < list_size); - assert (list[list_len] == 0); - - return (list); + return ((count >= 1) ? count : 1); } /* int *ps_read_tasks */ int ps_read_process (int pid, procstat_t *ps, char *state) @@ -665,7 +652,6 @@ int ps_read_process (int pid, procstat_t *ps, char *state) char *fields[64]; char fields_len; - int *tasks; int i; int ppid; @@ -673,7 +659,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)); @@ -713,21 +701,11 @@ int ps_read_process (int pid, procstat_t *ps, char *state) ps->num_lwp = 0; ps->num_proc = 0; } - else if ((tasks = ps_read_tasks (pid)) == NULL) - { - /* Kernel 2.4 or so */ - ps->num_lwp = 1; - ps->num_proc = 1; - } else { - ps->num_lwp = 0; + if ( (ps->num_lwp = ps_read_tasks (pid)) == -1 ) + return (-1); ps->num_proc = 1; - for (i = 0; tasks[i] != 0; i++) - ps->num_lwp++; - - free (tasks); - tasks = NULL; } /* Leave the rest at zero if this is only a zombi */ @@ -740,10 +718,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; @@ -751,7 +739,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); @@ -786,7 +776,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); @@ -1199,9 +1189,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; @@ -1241,7 +1233,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; @@ -1320,7 +1312,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; @@ -1361,7 +1355,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 */