X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=2e44018e8c16ae219e720ce39f68888de5af1cff;hb=9b626288aff81c68fe19210a58b4a32eeefde9d3;hp=4b59351cba7df9933859e5ffd46801117a42377c;hpb=d5c752eacdc72545328f1d5153f26ceb5fc6cfc0;p=collectd.git diff --git a/src/processes.c b/src/processes.c index 4b59351c..2e44018e 100644 --- a/src/processes.c +++ b/src/processes.c @@ -1,7 +1,8 @@ /** * collectd - src/processes.c * Copyright (C) 2005 Lyonel Vincent - * Copyright (C) 2006 Florian Forster (Mach code) + * Copyright (C) 2006-2008 Florian Forster (Mach code) + * Copyright (C) 2008 Oleg King * * 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 @@ -20,12 +21,13 @@ * Authors: * Lyonel Vincent * Florian octo Forster + * Oleg King + * Sebastian Harl **/ #include "collectd.h" #include "common.h" #include "plugin.h" -#include "utils_debug.h" #include "configfile.h" /* Include header files for the mach system, if they exist.. */ @@ -81,77 +83,37 @@ # ifndef CONFIG_HZ # define CONFIG_HZ 100 # endif -#endif /* KERNEL_LINUX */ +/* #endif KERNEL_LINUX */ -#define MODULE_NAME "processes" +#elif HAVE_LIBKVM_GETPROCS +# include +# include +# include +# if HAVE_SYS_SYSCTL_H +# include +# endif +/* #endif HAVE_LIBKVM_GETPROCS */ -#if HAVE_THREAD_INFO || KERNEL_LINUX -# define PROCESSES_HAVE_READ 1 #else -# define PROCESSES_HAVE_READ 0 +# error "No applicable input method." #endif -#define BUFSIZE 256 - -static char *processes_file = "processes.rrd"; -static char *processes_ds_def[] = -{ - "DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - "DS:sleeping:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - "DS:zombies:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - "DS:stopped:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - "DS:paging:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - "DS:blocked:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - NULL -}; -static int processes_ds_num = 6; - -static char *ps_rss_file = "processes/ps_rss-%s.rrd"; -static char *ps_rss_ds_def[] = -{ - /* max = 2^63 - 1 */ - "DS:byte:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", - NULL -}; -static int ps_rss_ds_num = 1; - -static char *ps_cputime_file = "processes/ps_cputime-%s.rrd"; -static char *ps_cputime_ds_def[] = -{ - /* 1 second in user-mode per second ought to be enough.. */ - "DS:user:COUNTER:"COLLECTD_HEARTBEAT":0:1000000", - "DS:syst:COUNTER:"COLLECTD_HEARTBEAT":0:1000000", - NULL -}; -static int ps_cputime_ds_num = 2; +#if HAVE_REGEX_H +# include +#endif -static char *ps_count_file = "processes/ps_count-%s.rrd"; -static char *ps_count_ds_def[] = -{ - "DS:processes:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - "DS:threads:GAUGE:"COLLECTD_HEARTBEAT":0:65535", - NULL -}; -static int ps_count_ds_num = 2; +#ifndef ARG_MAX +# define ARG_MAX 4096 +#endif -static char *ps_pagefaults_file = "processes/ps_pagefaults-%s.rrd"; -static char *ps_pagefaults_ds_def[] = -{ - /* max = 2^63 - 1 */ - "DS:minflt:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807", - "DS:majflt:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807", - NULL -}; -static int ps_pagefaults_ds_num = 2; +#define BUFSIZE 256 -#if HAVE_THREAD_INFO | KERNEL_LINUX -static char *config_keys[] = +static const char *config_keys[] = { "Process", - NULL + "ProcessMatch" }; -static int config_keys_num = 1; -#endif +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); typedef struct procstat_entry_s { @@ -160,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; @@ -179,10 +143,15 @@ typedef struct procstat_entry_s typedef struct procstat { char name[PROCSTAT_NAME_LEN]; +#if HAVE_REGEX_H + regex_t *re; +#endif 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; @@ -194,9 +163,7 @@ typedef struct procstat struct procstat_entry_s *instances; } procstat_t; -#if HAVE_THREAD_INFO | KERNEL_LINUX static procstat_t *list_head_g = NULL; -#endif #if HAVE_THREAD_INFO static mach_port_t port_host_self; @@ -208,23 +175,77 @@ static mach_msg_type_number_t pset_list_len; #elif KERNEL_LINUX static long pagesize_g; -#endif /* KERNEL_LINUX */ +/* #endif KERNEL_LINUX */ -#if HAVE_THREAD_INFO | KERNEL_LINUX -static void ps_list_register (const char *name) +#elif HAVE_LIBKVM_GETPROCS +/* no global variables */ +#endif /* HAVE_LIBKVM_GETPROCS */ + +/* put name of process from config to list_head_g tree + list_head_g is a list of 'procstat_t' structs with + processes names we want to watch */ +static void ps_list_register (const char *name, const char *regexp) { procstat_t *new; procstat_t *ptr; + int status; - if ((new = (procstat_t *) malloc (sizeof (procstat_t))) == NULL) + new = (procstat_t *) malloc (sizeof (procstat_t)); + if (new == NULL) + { + ERROR ("processes plugin: ps_list_register: malloc failed."); return; + } memset (new, 0, sizeof (procstat_t)); - strncpy (new->name, name, PROCSTAT_NAME_LEN); + sstrncpy (new->name, name, sizeof (new->name)); +#if HAVE_REGEX_H + if (regexp != NULL) + { + DEBUG ("ProcessMatch: adding \"%s\" as criteria to process %s.", regexp, name); + new->re = (regex_t *) malloc (sizeof (regex_t)); + if (new->re == NULL) + { + ERROR ("processes plugin: ps_list_register: malloc failed."); + sfree (new); + return; + } + + status = regcomp (new->re, regexp, REG_EXTENDED | REG_NOSUB); + if (status != 0) + { + DEBUG ("ProcessMatch: compiling the regular expression \"%s\" failed.", regexp); + sfree(new->re); + return; + } + } +#else + if (regexp != NULL) + { + ERROR ("processes plugin: ps_list_register: " + "Regular expression \"%s\" found in config " + "file, but support for regular expressions " + "has been dispabled at compile time.", + regexp); + sfree (new); + return; + } +#endif + for (ptr = list_head_g; ptr != NULL; ptr = ptr->next) { if (strcmp (ptr->name, name) == 0) + { + WARNING ("processes plugin: You have configured more " + "than one `Process' or " + "`ProcessMatch' with the same name. " + "All but the first setting will be " + "ignored."); + sfree (new->re); + sfree (new); return; + } + if (ptr->next == NULL) break; } @@ -233,20 +254,40 @@ static void ps_list_register (const char *name) list_head_g = new; else ptr->next = new; -} +} /* void ps_list_register */ -static procstat_t *ps_list_search (const char *name) +/* try to match name against entry, returns 1 if success */ +static int ps_list_match (const char *name, const char *cmdline, procstat_t *ps) { - procstat_t *ptr; +#if HAVE_REGEX_H + if (ps->re != NULL) + { + int status; + const char *str; - for (ptr = list_head_g; ptr != NULL; ptr = ptr->next) - if (strcmp (ptr->name, name) == 0) - break; + str = cmdline; + if ((str == NULL) || (str[0] == 0)) + str = name; - return (ptr); -} + assert (str != NULL); + + status = regexec (ps->re, str, + /* nmatch = */ 0, + /* pmatch = */ NULL, + /* eflags = */ 0); + if (status == 0) + return (1); + } + else +#endif + if (strcmp (ps->name, name) == 0) + return (1); -static void ps_list_add (const char *name, procstat_entry_t *entry) + return (0); +} /* int ps_list_match */ + +/* add process entry to 'instances' of process 'name' (or refresh it) */ +static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t *entry) { procstat_t *ps; procstat_entry_t *pse; @@ -254,115 +295,123 @@ static void ps_list_add (const char *name, procstat_entry_t *entry) if (entry->id == 0) return; - if ((ps = ps_list_search (name)) == NULL) - return; - - for (pse = ps->instances; pse != NULL; pse = pse->next) - if ((pse->id == entry->id) || (pse->next == NULL)) - break; - - if ((pse == NULL) || (pse->id != entry->id)) + for (ps = list_head_g; ps != NULL; ps = ps->next) { - procstat_entry_t *new; - - new = (procstat_entry_t *) malloc (sizeof (procstat_entry_t)); - if (new == NULL) - return; - memset (new, 0, sizeof (procstat_entry_t)); - new->id = entry->id; - - if (pse == NULL) - ps->instances = new; - else - pse->next = new; - - pse = new; - } - - 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; + if ((ps_list_match (name, cmdline, ps)) == 0) + continue; - if ((entry->vmem_minflt_counter == 0) - && (entry->vmem_majflt_counter == 0)) - { - pse->vmem_minflt_counter += entry->vmem_minflt; - pse->vmem_minflt = entry->vmem_minflt; + for (pse = ps->instances; pse != NULL; pse = pse->next) + if ((pse->id == entry->id) || (pse->next == NULL)) + break; - pse->vmem_majflt_counter += entry->vmem_majflt; - pse->vmem_majflt = entry->vmem_majflt; - } - else - { - if (entry->vmem_minflt_counter < pse->vmem_minflt_counter) - { - pse->vmem_minflt = entry->vmem_minflt_counter - + (ULONG_MAX - pse->vmem_minflt_counter); - } - else + if ((pse == NULL) || (pse->id != entry->id)) { - pse->vmem_minflt = entry->vmem_minflt_counter - pse->vmem_minflt_counter; + procstat_entry_t *new; + + new = (procstat_entry_t *) malloc (sizeof (procstat_entry_t)); + if (new == NULL) + return; + memset (new, 0, sizeof (procstat_entry_t)); + new->id = entry->id; + + if (pse == NULL) + ps->instances = new; + else + pse->next = new; + + pse = new; } - pse->vmem_minflt_counter = entry->vmem_minflt_counter; - if (entry->vmem_majflt_counter < pse->vmem_majflt_counter) + pse->age = 0; + 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)) { - pse->vmem_majflt = entry->vmem_majflt_counter - + (ULONG_MAX - pse->vmem_majflt_counter); + pse->vmem_minflt_counter += entry->vmem_minflt; + pse->vmem_minflt = entry->vmem_minflt; + + pse->vmem_majflt_counter += entry->vmem_majflt; + pse->vmem_majflt = entry->vmem_majflt; } else { - pse->vmem_majflt = entry->vmem_majflt_counter - pse->vmem_majflt_counter; + if (entry->vmem_minflt_counter < pse->vmem_minflt_counter) + { + pse->vmem_minflt = entry->vmem_minflt_counter + + (ULONG_MAX - pse->vmem_minflt_counter); + } + else + { + pse->vmem_minflt = entry->vmem_minflt_counter - pse->vmem_minflt_counter; + } + pse->vmem_minflt_counter = entry->vmem_minflt_counter; + + if (entry->vmem_majflt_counter < pse->vmem_majflt_counter) + { + pse->vmem_majflt = entry->vmem_majflt_counter + + (ULONG_MAX - pse->vmem_majflt_counter); + } + else + { + pse->vmem_majflt = entry->vmem_majflt_counter - pse->vmem_majflt_counter; + } + pse->vmem_majflt_counter = entry->vmem_majflt_counter; } - pse->vmem_majflt_counter = entry->vmem_majflt_counter; - } - ps->vmem_minflt_counter += pse->vmem_minflt; - ps->vmem_majflt_counter += pse->vmem_majflt; - - if ((entry->cpu_user_counter == 0) - && (entry->cpu_system_counter == 0)) - { - pse->cpu_user_counter += entry->cpu_user; - pse->cpu_user = entry->cpu_user; + ps->vmem_minflt_counter += pse->vmem_minflt; + ps->vmem_majflt_counter += pse->vmem_majflt; - pse->cpu_system_counter += entry->cpu_system; - pse->cpu_system = entry->cpu_system; - } - else - { - if (entry->cpu_user_counter < pse->cpu_user_counter) + if ((entry->cpu_user_counter == 0) + && (entry->cpu_system_counter == 0)) { - pse->cpu_user = entry->cpu_user_counter - + (ULONG_MAX - pse->cpu_user_counter); - } - else - { - pse->cpu_user = entry->cpu_user_counter - pse->cpu_user_counter; - } - pse->cpu_user_counter = entry->cpu_user_counter; + pse->cpu_user_counter += entry->cpu_user; + pse->cpu_user = entry->cpu_user; - if (entry->cpu_system_counter < pse->cpu_system_counter) - { - pse->cpu_system = entry->cpu_system_counter - + (ULONG_MAX - pse->cpu_system_counter); + pse->cpu_system_counter += entry->cpu_system; + pse->cpu_system = entry->cpu_system; } else { - pse->cpu_system = entry->cpu_system_counter - pse->cpu_system_counter; + if (entry->cpu_user_counter < pse->cpu_user_counter) + { + pse->cpu_user = entry->cpu_user_counter + + (ULONG_MAX - pse->cpu_user_counter); + } + else + { + pse->cpu_user = entry->cpu_user_counter - pse->cpu_user_counter; + } + pse->cpu_user_counter = entry->cpu_user_counter; + + if (entry->cpu_system_counter < pse->cpu_system_counter) + { + pse->cpu_system = entry->cpu_system_counter + + (ULONG_MAX - pse->cpu_system_counter); + } + else + { + pse->cpu_system = entry->cpu_system_counter - pse->cpu_system_counter; + } + pse->cpu_system_counter = entry->cpu_system_counter; } - pse->cpu_system_counter = entry->cpu_system_counter; - } - ps->cpu_user_counter += pse->cpu_user; - ps->cpu_system_counter += pse->cpu_system; + ps->cpu_user_counter += pse->cpu_user; + ps->cpu_system_counter += pse->cpu_system; + } } +/* remove old entries from instances of processes in list_head_g */ static void ps_list_reset (void) { procstat_t *ps; @@ -373,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; @@ -381,7 +432,7 @@ static void ps_list_reset (void) { if (pse->age > 10) { - DBG ("Removing this procstat entry cause it's too old: " + DEBUG ("Removing this procstat entry cause it's too old: " "id = %lu; name = %s;", pse->id, ps->name); @@ -408,22 +459,49 @@ static void ps_list_reset (void) } /* for (ps = list_head_g; ps != NULL; ps = ps->next) */ } -static int ps_config (char *key, char *value) +/* put all pre-defined 'Process' names from config to list_head_g tree */ +static int ps_config (const char *key, const char *value) { if (strcasecmp (key, "Process") == 0) { - ps_list_register (value); + ps_list_register (value, NULL); + } + else if (strcasecmp (key, "ProcessMatch") == 0) + { + char *new_val; + char *fields[3]; + int fields_num; + + new_val = strdup (value); + if (new_val == NULL) { + ERROR ("processes plugin: strdup failed when processing " + "`ProcessMatch %s'.", value); + return (1); + } + + fields_num = strsplit (new_val, fields, + STATIC_ARRAY_SIZE (fields)); + if (fields_num != 2) + { + ERROR ("processes plugin: `ProcessMatch' needs exactly " + "two string arguments."); + sfree (new_val); + return (1); + } + ps_list_register (fields[0], fields[1]); + sfree (new_val); } else { + ERROR ("processes plugin: The `%s' configuration option is not " + "understood and will be ignored.", key); return (-1); } return (0); } -#endif /* HAVE_THREAD_INFO | KERNEL_LINUX */ -static void ps_init (void) +static int ps_init (void) { #if HAVE_THREAD_INFO kern_return_t status; @@ -444,150 +522,100 @@ static void ps_init (void) &pset_list, &pset_list_len)) != KERN_SUCCESS) { - syslog (LOG_ERR, "host_processor_sets failed: %s\n", + ERROR ("host_processor_sets failed: %s\n", mach_error_string (status)); pset_list = NULL; pset_list_len = 0; - return; + return (-1); } /* #endif HAVE_THREAD_INFO */ #elif KERNEL_LINUX pagesize_g = sysconf(_SC_PAGESIZE); - DBG ("pagesize_g = %li; CONFIG_HZ = %i;", + DEBUG ("pagesize_g = %li; CONFIG_HZ = %i;", pagesize_g, CONFIG_HZ); -#endif /* KERNEL_LINUX */ +/* #endif KERNEL_LINUX */ - return; -} - -static void ps_write (char *host, char *inst, char *val) -{ - rrd_update_file (host, processes_file, val, - processes_ds_def, processes_ds_num); -} - -static void ps_rss_write (char *host, char *inst, char *val) -{ - char filename[256]; - int status; +#elif HAVE_LIBKVM_GETPROCS +/* no initialization */ +#endif /* HAVE_LIBKVM_GETPROCS */ - status = snprintf (filename, 256, ps_rss_file, inst); - if ((status < 1) || (status >= 256)) - return; - - rrd_update_file (host, filename, val, ps_rss_ds_def, ps_rss_ds_num); -} - -static void ps_cputime_write (char *host, char *inst, char *val) -{ - char filename[256]; - int status; - - status = snprintf (filename, 256, ps_cputime_file, inst); - if ((status < 1) || (status >= 256)) - return; - - DBG ("host = %s; filename = %s; val = %s;", - host, filename, val); - rrd_update_file (host, filename, val, - ps_cputime_ds_def, ps_cputime_ds_num); -} - -static void ps_count_write (char *host, char *inst, char *val) -{ - char filename[256]; - int status; - - status = snprintf (filename, 256, ps_count_file, inst); - if ((status < 1) || (status >= 256)) - return; - - DBG ("host = %s; filename = %s; val = %s;", - host, filename, val); - rrd_update_file (host, filename, val, - ps_count_ds_def, ps_count_ds_num); -} - -static void ps_pagefaults_write (char *host, char *inst, char *val) -{ - char filename[256]; - int status; - - status = snprintf (filename, 256, ps_pagefaults_file, inst); - if ((status < 1) || (status >= 256)) - return; - - DBG ("host = %s; filename = %s; val = %s;", - host, filename, val); - rrd_update_file (host, filename, val, - ps_pagefaults_ds_def, ps_pagefaults_ds_num); -} + return (0); +} /* int ps_init */ -#if PROCESSES_HAVE_READ -static void ps_submit (int running, - int sleeping, - int zombies, - int stopped, - int paging, - int blocked) +/* submit global state (e.g.: qty of zombies, running, etc..) */ +static void ps_submit_state (const char *state, double value) { - char buf[BUFSIZE]; + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - if (snprintf (buf, BUFSIZE, "%u:%i:%i:%i:%i:%i:%i", - (unsigned int) curtime, - running, sleeping, zombies, stopped, paging, - blocked) >= BUFSIZE) - return; + values[0].gauge = value; - DBG ("running = %i; sleeping = %i; zombies = %i; stopped = %i; paging = %i; blocked = %i;", - running, sleeping, zombies, stopped, paging, blocked); + vl.values = values; + vl.values_len = 1; + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "processes", sizeof (vl.plugin)); + sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance)); + sstrncpy (vl.type, "ps_state", sizeof (vl.type)); + sstrncpy (vl.type_instance, state, sizeof (vl.type_instance)); - plugin_submit (MODULE_NAME, "-", buf); + plugin_dispatch_values (&vl); } +/* submit info about specific process (e.g.: memory taken, cpu usage, etc..) */ static void ps_submit_proc_list (procstat_t *ps) { - char buffer[64]; - - if (ps == NULL) - return; - - snprintf (buffer, 64, "%u:%lu", - (unsigned int) curtime, - ps->vmem_rss); - buffer[63] = '\0'; - plugin_submit ("ps_rss", ps->name, buffer); - - snprintf (buffer, 64, "%u:%u:%u", - (unsigned int) curtime, - /* Make the counter overflow */ - (unsigned int) (ps->cpu_user_counter & 0xFFFFFFFF), - (unsigned int) (ps->cpu_system_counter & 0xFFFFFFFF)); - buffer[63] = '\0'; - plugin_submit ("ps_cputime", ps->name, buffer); - - snprintf (buffer, 64, "%u:%lu:%lu", - (unsigned int) curtime, - ps->num_proc, ps->num_lwp); - buffer[63] = '\0'; - plugin_submit ("ps_count", ps->name, buffer); - - snprintf (buffer, 64, "%u:%lu:%lu", - (unsigned int) curtime, - ps->vmem_minflt_counter, ps->vmem_majflt_counter); - buffer[63] = '\0'; - plugin_submit ("ps_pagefaults", ps->name, buffer); - - DBG ("name = %s; num_proc = %lu; num_lwp = %lu; vmem_rss = %lu; " + value_t values[2]; + value_list_t vl = VALUE_LIST_INIT; + + vl.values = values; + vl.values_len = 2; + 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; + vl.values_len = 2; + plugin_dispatch_values (&vl); + + sstrncpy (vl.type, "ps_count", sizeof (vl.type)); + vl.values[0].gauge = ps->num_proc; + vl.values[1].gauge = ps->num_lwp; + vl.values_len = 2; + plugin_dispatch_values (&vl); + + sstrncpy (vl.type, "ps_pagefaults", sizeof (vl.type)); + vl.values[0].counter = ps->vmem_minflt_counter; + vl.values[1].counter = ps->vmem_majflt_counter; + vl.values_len = 2; + plugin_dispatch_values (&vl); + + DEBUG ("name = %s; num_proc = %lu; num_lwp = %lu; vmem_rss = %lu; " "vmem_minflt_counter = %lu; vmem_majflt_counter = %lu; " "cpu_user_counter = %lu; cpu_system_counter = %lu;", ps->name, ps->num_proc, ps->num_lwp, ps->vmem_rss, - ps->vmem_minflt_counter, ps->vmem_majflt_counter, ps->cpu_user_counter, - ps->cpu_system_counter); - -} + ps->vmem_minflt_counter, ps->vmem_majflt_counter, + ps->cpu_user_counter, ps->cpu_system_counter); +} /* void ps_submit_proc_list */ +/* ------- additional functions for KERNEL_LINUX/HAVE_THREAD_INFO ------- */ #if KERNEL_LINUX static int *ps_read_tasks (int pid) { @@ -599,12 +627,11 @@ static int *ps_read_tasks (int pid) DIR *dh; struct dirent *ent; - snprintf (dirname, 64, "/proc/%i/task", pid); - dirname[63] = '\0'; + ssnprintf (dirname, sizeof (dirname), "/proc/%i/task", pid); if ((dh = opendir (dirname)) == NULL) { - DBG ("Failed to open directory `%s'", dirname); + DEBUG ("Failed to open directory `%s'", dirname); return (NULL); } @@ -624,7 +651,7 @@ static int *ps_read_tasks (int pid) { if (list != NULL) free (list); - syslog (LOG_ERR, "processes plugin: " + ERROR ("processes plugin: " "Failed to allocate more memory."); return (NULL); } @@ -655,7 +682,6 @@ int ps_read_process (int pid, procstat_t *ps, char *state) { char filename[64]; char buffer[1024]; - FILE *fh; char *fields[64]; char fields_len; @@ -668,41 +694,33 @@ 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)); - snprintf (filename, 64, "/proc/%i/stat", pid); - filename[63] = '\0'; + ssnprintf (filename, sizeof (filename), "/proc/%i/stat", pid); - if ((fh = fopen (filename, "r")) == NULL) + i = read_file_contents (filename, buffer, sizeof(buffer) - 1); + if (i <= 0) return (-1); - - if (fgets (buffer, 1024, fh) == NULL) - { - fclose (fh); - return (-1); - } - - fclose (fh); + buffer[i] = 0; fields_len = strsplit (buffer, fields, 64); if (fields_len < 24) { - DBG ("`%s' has only %i fields..", - filename, fields_len); + DEBUG ("processes plugin: ps_read_process (pid = %i):" + " `%s' has only %i fields..", + (int) pid, filename, fields_len); return (-1); } - else if (fields_len != 41) - { - DBG ("WARNING: (fields_len = %i) != 41", fields_len); - } /* copy the name, strip brackets in the process */ name_len = strlen (fields[1]) - 2; if ((fields[1][0] != '(') || (fields[1][name_len + 1] != ')')) { - DBG ("No brackets found in process name: `%s'", fields[1]); + DEBUG ("No brackets found in process name: `%s'", fields[1]); return (-1); } fields[1] = fields[1] + 1; @@ -711,19 +729,19 @@ int ps_read_process (int pid, procstat_t *ps, char *state) ppid = atoi (fields[3]); - *state = fields[2][0]; - - if (*state == 'Z') - { - 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; - } + *state = fields[2][0]; + + if (*state == 'Z') + { + 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; @@ -735,20 +753,30 @@ int ps_read_process (int pid, procstat_t *ps, char *state) tasks = NULL; } - /* Leave the rest at zero if this is only a zombi */ + /* Leave the rest at zero if this is only a zombi */ if (ps->num_proc == 0) { - DBG ("This is only a zombi: pid = %i; name = %s;", - pid, ps->name); + DEBUG ("processes plugin: This is only a zombi: pid = %i; " + "name = %s;", pid, ps->name); return (0); } 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; @@ -756,11 +784,103 @@ 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); } /* int ps_read_process (...) */ + +static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len) +{ + char *buf_ptr; + size_t len; + + char file[PATH_MAX]; + int fd; + + size_t n; + + if ((pid < 1) || (NULL == buf) || (buf_len < 2)) + return NULL; + + ssnprintf (file, sizeof (file), "/proc/%u/cmdline", pid); + + fd = open (file, O_RDONLY); + if (fd < 0) { + char errbuf[4096]; + WARNING ("processes plugin: Failed to open `%s': %s.", file, + sstrerror (errno, errbuf, sizeof (errbuf))); + return NULL; + } + + buf_ptr = buf; + len = buf_len; + + n = 0; + + while (42) { + ssize_t status; + + status = read (fd, (void *)buf_ptr, len); + + if (status < 0) { + char errbuf[4096]; + + if ((EAGAIN == errno) || (EINTR == errno)) + continue; + + WARNING ("processes plugin: Failed to read from `%s': %s.", file, + sstrerror (errno, errbuf, sizeof (errbuf))); + close (fd); + return NULL; + } + + n += status; + + if (status == 0) + break; + + buf_ptr += status; + len -= status; + + if (len <= 0) + break; + } + + close (fd); + + if (0 == n) { + /* cmdline not available; e.g. kernel thread, zombie */ + if (NULL == name) + return NULL; + + ssnprintf (buf, buf_len, "[%s]", name); + return buf; + } + + assert (n <= buf_len); + + if (n == buf_len) + --n; + buf[n] = '\0'; + + --n; + /* remove trailing whitespace */ + while ((n > 0) && (isspace (buf[n]) || ('\0' == buf[n]))) { + buf[n] = '\0'; + --n; + } + + /* arguments are separated by '\0' in /proc//cmdline */ + while (n > 0) { + if ('\0' == buf[n]) + buf[n] = ' '; + --n; + } + return buf; +} /* char *ps_get_cmdline (...) */ #endif /* KERNEL_LINUX */ #if HAVE_THREAD_INFO @@ -789,7 +909,7 @@ static int mach_get_task_name (task_t t, int *pid, char *name, size_t name_max_l strncpy (name, kp.kp_proc.p_comm, name_max_len - 1); name[name_max_len - 1] = '\0'; - DBG ("pid = %i; name = %s;", *pid, name); + DEBUG ("pid = %i; name = %s;", *pid, name); /* We don't do the special handling for `p_comm == "LaunchCFMApp"' as * `top' does it, because it is a lot of work and only used when @@ -798,8 +918,10 @@ static int mach_get_task_name (task_t t, int *pid, char *name, size_t name_max_l return (0); } #endif /* HAVE_THREAD_INFO */ +/* ------- end of additional functions for KERNEL_LINUX/HAVE_THREAD_INFO ------- */ -static void ps_read (void) +/* do actual readings from kernel */ +static int ps_read (void) { #if HAVE_THREAD_INFO kern_return_t status; @@ -845,7 +967,7 @@ static void ps_read (void) pset_list[pset], &port_pset_priv)) != KERN_SUCCESS) { - syslog (LOG_ERR, "host_processor_set_priv failed: %s\n", + ERROR ("host_processor_set_priv failed: %s\n", mach_error_string (status)); continue; } @@ -854,7 +976,7 @@ static void ps_read (void) &task_list, &task_list_len)) != KERN_SUCCESS) { - syslog (LOG_ERR, "processor_set_tasks failed: %s\n", + ERROR ("processor_set_tasks failed: %s\n", mach_error_string (status)); mach_port_deallocate (port_task_self, port_pset_priv); continue; @@ -866,7 +988,13 @@ static void ps_read (void) if (mach_get_task_name (task_list[task], &task_pid, task_name, PROCSTAT_NAME_LEN) == 0) - ps = ps_list_search (task_name); + { + /* search for at least one match */ + for (ps = list_head_g; ps != NULL; ps = ps->next) + /* FIXME: cmdline should be here instead of NULL */ + if (ps_list_match (task_name, NULL, ps) == 1) + break; + } /* Collect more detailed statistics for this process */ if (ps != NULL) @@ -888,7 +1016,7 @@ static void ps_read (void) &task_basic_info_len); if (status != KERN_SUCCESS) { - syslog (LOG_ERR, "task_info failed: %s", + ERROR ("task_info failed: %s", mach_error_string (status)); continue; /* with next thread_list */ } @@ -900,7 +1028,7 @@ static void ps_read (void) &task_events_info_len); if (status != KERN_SUCCESS) { - syslog (LOG_ERR, "task_info failed: %s", + ERROR ("task_info failed: %s", mach_error_string (status)); continue; /* with next thread_list */ } @@ -912,7 +1040,7 @@ static void ps_read (void) &task_absolutetime_info_len); if (status != KERN_SUCCESS) { - syslog (LOG_ERR, "task_info failed: %s", + ERROR ("task_info failed: %s", mach_error_string (status)); continue; /* with next thread_list */ } @@ -936,7 +1064,7 @@ static void ps_read (void) * thread is nonsense, since the task/process * is dead. */ zombies++; - DBG ("task_threads failed: %s", + DEBUG ("task_threads failed: %s", mach_error_string (status)); if (task_list[task] != port_task_self) mach_port_deallocate (port_task_self, @@ -953,7 +1081,7 @@ static void ps_read (void) &thread_data_len); if (status != KERN_SUCCESS) { - syslog (LOG_ERR, "thread_info failed: %s", + ERROR ("thread_info failed: %s", mach_error_string (status)); if (task_list[task] != port_task_self) mach_port_deallocate (port_task_self, @@ -985,8 +1113,7 @@ static void ps_read (void) * There's only zombie tasks, which are * handled above. */ default: - syslog (LOG_WARNING, - "Unknown thread status: %s", + WARNING ("Unknown thread status: %i", thread_data.run_state); break; } /* switch (thread_data.run_state) */ @@ -996,7 +1123,7 @@ static void ps_read (void) status = mach_port_deallocate (port_task_self, thread_list[thread]); if (status != KERN_SUCCESS) - syslog (LOG_ERR, "mach_port_deallocate failed: %s", + ERROR ("mach_port_deallocate failed: %s", mach_error_string (status)); } } /* for (thread_list) */ @@ -1006,7 +1133,7 @@ static void ps_read (void) thread_list_len * sizeof (thread_act_t))) != KERN_SUCCESS) { - syslog (LOG_ERR, "vm_deallocate failed: %s", + ERROR ("vm_deallocate failed: %s", mach_error_string (status)); } thread_list = NULL; @@ -1020,19 +1147,20 @@ static void ps_read (void) status = mach_port_deallocate (port_task_self, task_list[task]); if (status != KERN_SUCCESS) - syslog (LOG_ERR, "mach_port_deallocate failed: %s", + ERROR ("mach_port_deallocate failed: %s", mach_error_string (status)); } if (ps != NULL) - ps_list_add (task_name, &pse); + /* FIXME: cmdline should be here instead of NULL */ + ps_list_add (task_name, NULL, &pse); } /* for (task_list) */ if ((status = vm_deallocate (port_task_self, (vm_address_t) task_list, task_list_len * sizeof (task_t))) != KERN_SUCCESS) { - syslog (LOG_ERR, "vm_deallocate failed: %s", + ERROR ("vm_deallocate failed: %s", mach_error_string (status)); } task_list = NULL; @@ -1041,12 +1169,16 @@ static void ps_read (void) if ((status = mach_port_deallocate (port_task_self, port_pset_priv)) != KERN_SUCCESS) { - syslog (LOG_ERR, "mach_port_deallocate failed: %s", + ERROR ("mach_port_deallocate failed: %s", mach_error_string (status)); } } /* for (pset_list) */ - ps_submit (running, sleeping, zombies, stopped, -1, blocked); + ps_submit_state ("running", running); + ps_submit_state ("sleeping", sleeping); + ps_submit_state ("zombies", zombies); + ps_submit_state ("stopped", stopped); + ps_submit_state ("blocked", blocked); for (ps = list_head_g; ps != NULL; ps = ps->next) ps_submit_proc_list (ps); @@ -1064,6 +1196,8 @@ static void ps_read (void) DIR *proc; int pid; + char cmdline[ARG_MAX]; + int status; procstat_t ps; procstat_entry_t pse; @@ -1076,8 +1210,10 @@ static void ps_read (void) if ((proc = opendir ("/proc")) == NULL) { - syslog (LOG_ERR, "Cannot open `/proc': %s", strerror (errno)); - return; + char errbuf[1024]; + ERROR ("Cannot open `/proc': %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); } while ((ent = readdir (proc)) != NULL) @@ -1091,16 +1227,18 @@ static void ps_read (void) status = ps_read_process (pid, &ps, &state); if (status != 0) { - DBG ("ps_read_process failed: %i", status); + DEBUG ("ps_read_process failed: %i", status); continue; } 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; @@ -1122,32 +1260,155 @@ static void ps_read (void) case 'W': paging++; break; } - ps_list_add (ps.name, &pse); + ps_list_add (ps.name, + ps_get_cmdline (pid, ps.name, cmdline, sizeof (cmdline)), + &pse); } closedir (proc); - ps_submit (running, sleeping, zombies, stopped, paging, blocked); + ps_submit_state ("running", running); + ps_submit_state ("sleeping", sleeping); + ps_submit_state ("zombies", zombies); + ps_submit_state ("stopped", stopped); + ps_submit_state ("paging", paging); + ps_submit_state ("blocked", blocked); for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next) ps_submit_proc_list (ps_ptr); -#endif /* KERNEL_LINUX */ -} -#else -# define ps_read NULL -#endif /* PROCESSES_HAVE_READ */ +/* #endif KERNEL_LINUX */ + +#elif HAVE_LIBKVM_GETPROCS + int running = 0; + int sleeping = 0; + int zombies = 0; + int stopped = 0; + int blocked = 0; + int idle = 0; + int wait = 0; + + kvm_t *kd; + char errbuf[1024]; + char cmdline[ARG_MAX]; + char *cmdline_ptr; + struct kinfo_proc *procs; /* array of processes */ + char **argv; + int count; /* returns number of processes */ + int i; + + procstat_t *ps_ptr; + procstat_entry_t pse; + + ps_list_reset (); + + /* Open the kvm interface, get a descriptor */ + kd = kvm_open (NULL, NULL, NULL, 0, errbuf); + if (kd == NULL) + { + ERROR ("processes plugin: Cannot open kvm interface: %s", + errbuf); + return (0); + } + + /* Get the list of processes. */ + procs = kvm_getprocs(kd, KERN_PROC_ALL, 0, &count); + if (procs == NULL) + { + kvm_close (kd); + ERROR ("processes plugin: Cannot get kvm processes list: %s", + kvm_geterr(kd)); + return (0); + } + + /* Iterate through the processes in kinfo_proc */ + for (i = 0; i < count; i++) + { + /* retrieve the arguments */ + cmdline[0] = 0; + cmdline_ptr = NULL; + + argv = kvm_getargv (kd, (const struct kinfo_proc *) &(procs[i]), 0); + if (argv != NULL) + { + int status; + int argc; + + argc = 0; + while (argv[argc] != NULL) + argc++; + + status = strjoin (cmdline, sizeof (cmdline), + argv, argc, " "); + + if (status < 0) + { + WARNING ("processes plugin: Command line did " + "not fit into buffer."); + } + else + { + cmdline_ptr = &cmdline[0]; + } + } + + pse.id = procs[i].ki_pid; + pse.age = 0; + + 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; + pse.vmem_majflt_counter = procs[i].ki_rusage.ru_majflt; + + pse.cpu_user = 0; + pse.cpu_user_counter = procs[i].ki_rusage.ru_utime.tv_sec + * 1000 + + procs[i].ki_rusage.ru_utime.tv_usec; + pse.cpu_system = 0; + pse.cpu_system_counter = procs[i].ki_rusage.ru_stime.tv_sec + * 1000 + + procs[i].ki_rusage.ru_stime.tv_usec; + + switch (procs[i].ki_stat) + { + case SSTOP: stopped++; break; + case SSLEEP: sleeping++; break; + case SRUN: running++; break; + case SIDL: idle++; break; + case SWAIT: wait++; break; + case SLOCK: blocked++; break; + case SZOMB: zombies++; break; + } + + ps_list_add (procs[i].ki_comm, cmdline_ptr, &pse); + } + + kvm_close(kd); + + ps_submit_state ("running", running); + ps_submit_state ("sleeping", sleeping); + ps_submit_state ("zombies", zombies); + ps_submit_state ("stopped", stopped); + ps_submit_state ("blocked", blocked); + ps_submit_state ("idle", idle); + ps_submit_state ("wait", wait); + + for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next) + ps_submit_proc_list (ps_ptr); +#endif /* HAVE_LIBKVM_GETPROCS */ + + return (0); +} /* int ps_read */ void module_register (void) { - plugin_register (MODULE_NAME, ps_init, ps_read, ps_write); - plugin_register ("ps_rss", NULL, NULL, ps_rss_write); - plugin_register ("ps_cputime", NULL, NULL, ps_cputime_write); - plugin_register ("ps_count", NULL, NULL, ps_count_write); - plugin_register ("ps_pagefaults", NULL, NULL, ps_pagefaults_write); -#if HAVE_THREAD_INFO | KERNEL_LINUX - cf_register (MODULE_NAME, ps_config, config_keys, config_keys_num); -#endif -} - -#undef BUFSIZE -#undef MODULE_NAME + plugin_register_config ("processes", ps_config, + config_keys, config_keys_num); + plugin_register_init ("processes", ps_init); + plugin_register_read ("processes", ps_read); +} /* void module_register */