X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=619b6e3777abf1ef2601bf1f1c0746c8b65ebb70;hb=27f7e9a53a309c23143691c37e50727a5f0e2386;hp=c69b5ce8451ec29284238de79f41afaf671b94a7;hpb=a7cd32dff9ea56a6771c5479468eda2a15d52f1f;p=collectd.git diff --git a/src/processes.c b/src/processes.c index c69b5ce8..619b6e37 100644 --- a/src/processes.c +++ b/src/processes.c @@ -1,6 +1,7 @@ /** * collectd - src/processes.c * Copyright (C) 2005 Lyonel Vincent + * Copyright (C) 2006 Florian Forster (Mach code) * * 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 @@ -21,72 +22,932 @@ * Florian octo Forster **/ -#include "processes.h" +#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.. */ +#if HAVE_THREAD_INFO +# if HAVE_MACH_MACH_INIT_H +# include +# endif +# if HAVE_MACH_HOST_PRIV_H +# include +# endif +# if HAVE_MACH_MACH_ERROR_H +# include +# endif +# if HAVE_MACH_MACH_HOST_H +# include +# endif +# if HAVE_MACH_MACH_PORT_H +# include +# endif +# if HAVE_MACH_MACH_TYPES_H +# include +# endif +# if HAVE_MACH_MESSAGE_H +# include +# endif +# if HAVE_MACH_PROCESSOR_SET_H +# include +# endif +# if HAVE_MACH_TASK_H +# include +# endif +# if HAVE_MACH_THREAD_ACT_H +# include +# endif +# if HAVE_MACH_VM_REGION_H +# include +# endif +# if HAVE_MACH_VM_MAP_H +# include +# endif +# if HAVE_MACH_VM_PROT_H +# include +# endif +/* #endif HAVE_THREAD_INFO */ + +#elif KERNEL_LINUX +# if HAVE_LINUX_CONFIG_H +# include +# endif +# ifndef CONFIG_HZ +# define CONFIG_HZ 100 +# endif +#endif /* KERNEL_LINUX */ -#if COLLECT_PROCESSES #define MODULE_NAME "processes" -#include "common.h" -#include "plugin.h" +#if HAVE_THREAD_INFO || KERNEL_LINUX +# define PROCESSES_HAVE_READ 1 +#else +# define PROCESSES_HAVE_READ 0 +#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; -static char *ps_file = "processes.rrd"; +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; -static char *ds_def[] = +static char *ps_pagefaults_file = "processes/ps_pagefaults-%s.rrd"; +static char *ps_pagefaults_ds_def[] = { - "DS:running:GAUGE:25:0:65535", - "DS:sleeping:GAUGE:25:0:65535", - "DS:zombies:GAUGE:25:0:65535", - "DS:stopped:GAUGE:25:0:65535", - "DS:paging:GAUGE:25:0:65535", - "DS:blocked:GAUGE:25:0:65535", + /* max = 2^63 - 1 */ + "DS:minflt:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:majflt:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807", NULL }; -static int ds_num = 6; +static int ps_pagefaults_ds_num = 2; -extern time_t curtime; +static char *config_keys[] = +{ + "Process", + NULL +}; +static int config_keys_num = 1; -void ps_init (void) +typedef struct procstat_entry_s { + unsigned long id; + unsigned long age; + + unsigned long num_proc; + unsigned long num_lwp; + unsigned long vmem_rss; + + unsigned long vmem_minflt; + unsigned long vmem_majflt; + unsigned long vmem_minflt_counter; + unsigned long vmem_majflt_counter; + + unsigned long cpu_user; + unsigned long cpu_system; + unsigned long cpu_user_counter; + unsigned long cpu_system_counter; + + struct procstat_entry_s *next; +} procstat_entry_t; + +#define PROCSTAT_NAME_LEN 256 +typedef struct procstat +{ + char name[PROCSTAT_NAME_LEN]; + + unsigned long num_proc; + unsigned long num_lwp; + unsigned long vmem_rss; + + unsigned long vmem_minflt_counter; + unsigned long vmem_majflt_counter; + + unsigned long cpu_user_counter; + unsigned long cpu_system_counter; + + struct procstat *next; + struct procstat_entry_s *instances; +} procstat_t; + +static procstat_t *list_head_g = NULL; + +#if HAVE_THREAD_INFO +static mach_port_t port_host_self; +static mach_port_t port_task_self; + +static processor_set_name_array_t pset_list; +static mach_msg_type_number_t pset_list_len; +/* #endif HAVE_THREAD_INFO */ + +#elif KERNEL_LINUX +static long pagesize_g; +#endif /* KERNEL_LINUX */ + +#if HAVE_THREAD_INFO +/* ps_list_* not used yet */ +/* #endif HAVE_THREAD_INFO */ + +#elif KERNEL_LINUX +static void ps_list_register (const char *name) +{ + procstat_t *new; + procstat_t *ptr; + + if ((new = (procstat_t *) malloc (sizeof (procstat_t))) == NULL) + return; + memset (new, 0, sizeof (procstat_t)); + strncpy (new->name, name, PROCSTAT_NAME_LEN); + + for (ptr = list_head_g; ptr != NULL; ptr = ptr->next) + { + if (strcmp (ptr->name, name) == 0) + return; + if (ptr->next == NULL) + break; + } + + if (ptr == NULL) + list_head_g = new; + else + ptr->next = new; } -void ps_write (char *host, char *inst, char *val) +static procstat_t *ps_list_search (const char *name) { - rrd_update_file (host, ps_file, val, ds_def, ds_num); + procstat_t *ptr; + + for (ptr = list_head_g; ptr != NULL; ptr = ptr->next) + if (strcmp (ptr->name, name) == 0) + break; + + return (ptr); } -#define BUFSIZE 256 -void ps_submit (unsigned int running, - unsigned int sleeping, - unsigned int zombies, - unsigned int stopped, - unsigned int paging, - unsigned int blocked) +static void ps_list_add (const char *name, procstat_entry_t *entry) +{ + procstat_t *ps; + procstat_entry_t *pse; + + 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)) + { + 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 ((entry->vmem_minflt_counter == 0) + && (entry->vmem_majflt_counter == 0)) + { + 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 + { + 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; + } + + 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; + + pse->cpu_system_counter += entry->cpu_system; + pse->cpu_system = entry->cpu_system; + } + else + { + 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; + } + + ps->cpu_user_counter += pse->cpu_user; + ps->cpu_system_counter += pse->cpu_system; +} + +static void ps_list_reset (void) +{ + procstat_t *ps; + procstat_entry_t *pse; + procstat_entry_t *pse_prev; + + for (ps = list_head_g; ps != NULL; ps = ps->next) + { + ps->num_proc = 0; + ps->num_lwp = 0; + ps->vmem_rss = 0; + + pse_prev = NULL; + pse = ps->instances; + while (pse != NULL) + { + if (pse->age > 10) + { + DBG ("Removing this procstat entry cause it's too old: " + "id = %lu; name = %s;", + pse->id, ps->name); + + if (pse_prev == NULL) + { + ps->instances = pse->next; + free (pse); + pse = ps->instances; + } + else + { + pse_prev->next = pse->next; + free (pse); + pse = pse_prev->next; + } + } + else + { + pse->age++; + pse_prev = pse; + pse = pse->next; + } + } /* while (pse != NULL) */ + } /* for (ps = list_head_g; ps != NULL; ps = ps->next) */ +} +#endif /* KERNEL_LINUX */ + +static int ps_config (char *key, char *value) +{ + if (strcasecmp (key, "Process") == 0) + { + ps_list_register (value); + } + else + { + return (-1); + } + + return (0); +} + +static void ps_init (void) +{ +#if HAVE_THREAD_INFO + kern_return_t status; + + port_host_self = mach_host_self (); + port_task_self = mach_task_self (); + + if (pset_list != NULL) + { + vm_deallocate (port_task_self, + (vm_address_t) pset_list, + pset_list_len * sizeof (processor_set_t)); + pset_list = NULL; + pset_list_len = 0; + } + + if ((status = host_processor_sets (port_host_self, + &pset_list, + &pset_list_len)) != KERN_SUCCESS) + { + syslog (LOG_ERR, "host_processor_sets failed: %s\n", + mach_error_string (status)); + pset_list = NULL; + pset_list_len = 0; + return; + } +/* #endif HAVE_THREAD_INFO */ + +#elif KERNEL_LINUX + pagesize_g = sysconf(_SC_PAGESIZE); + DBG ("pagesize_g = %li; CONFIG_HZ = %i;", + pagesize_g, CONFIG_HZ); +#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; + + 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); +} + +#if PROCESSES_HAVE_READ +static void ps_submit (int running, + int sleeping, + int zombies, + int stopped, + int paging, + int blocked) { char buf[BUFSIZE]; - if (snprintf (buf, BUFSIZE, "%u:%u:%u:%u:%u:%u:%u", + if (snprintf (buf, BUFSIZE, "%u:%i:%i:%i:%i:%i:%i", (unsigned int) curtime, running, sleeping, zombies, stopped, paging, blocked) >= BUFSIZE) return; + DBG ("running = %i; sleeping = %i; zombies = %i; stopped = %i; paging = %i; blocked = %i;", + running, sleeping, zombies, stopped, paging, blocked); + plugin_submit (MODULE_NAME, "-", buf); } -void ps_read (void) +static void ps_submit_proc_list (procstat_t *ps) { -#ifdef KERNEL_LINUX - unsigned int running, sleeping, zombies, stopped, paging, blocked; + char buffer[64]; - char buf[BUFSIZE]; - char filename[20]; /* need 17 bytes */ - char *fields[256]; + 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; " + "vmem_minflt_counter = %i; vmem_majflt_counter = %i; " + "cpu_user_counter = %i; cpu_system_counter = %i;", + 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); + +} + +#if KERNEL_LINUX +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; - DIR *proc; + + snprintf (dirname, 64, "/proc/%i/task", pid); + dirname[63] = '\0'; + + if ((dh = opendir (dirname)) == NULL) + { + syslog (LOG_NOTICE, "processes plugin: Failed to open directory `%s'", + dirname); + return (NULL); + } + + while ((ent = readdir (dh)) != NULL) + { + if (!isdigit (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); + syslog (LOG_ERR, "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++; + } + + closedir (dh); + + assert (list_len < list_size); + assert (list[list_len] == 0); + + return (list); +} + +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; + + int *tasks; + int i; + + int ppid; + int name_len; + + long long unsigned cpu_user_counter; + long long unsigned cpu_system_counter; + long long unsigned vmem_rss; + + memset (ps, 0, sizeof (procstat_t)); + + snprintf (filename, 64, "/proc/%i/stat", pid); + filename[63] = '\0'; + + if ((fh = fopen (filename, "r")) == NULL) + return (-1); + + if (fgets (buffer, 1024, fh) == NULL) + { + fclose (fh); + return (-1); + } + + fclose (fh); + + fields_len = strsplit (buffer, fields, 64); + if (fields_len < 24) + { + DBG ("`%s' has only %i fields..", + 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]); + return (-1); + } + fields[1] = fields[1] + 1; + fields[1][name_len] = '\0'; + strncpy (ps->name, fields[1], PROCSTAT_NAME_LEN); + + ppid = atoi (fields[3]); + + if ((tasks = ps_read_tasks (pid)) == NULL) + { + /* This happends for zombied, e.g. */ + DBG ("ps_read_tasks (%i) failed.", pid); + *state = 'Z'; + ps->num_lwp = 0; + ps->num_proc = 0; + } + else + { + *state = '\0'; + ps->num_lwp = 0; + 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 an LWP */ + if (ps->num_proc == 0) + { + DBG ("This is only an LWP: 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]); + ps->vmem_minflt_counter = atol (fields[9]); + ps->vmem_majflt_counter = atol (fields[11]); + + /* Convert jiffies to useconds */ + cpu_user_counter = cpu_user_counter * 1000000 / CONFIG_HZ; + cpu_system_counter = cpu_system_counter * 1000000 / CONFIG_HZ; + vmem_rss = vmem_rss * pagesize_g; + + ps->cpu_user_counter = (unsigned long) cpu_user_counter; + ps->cpu_system_counter = (unsigned long) cpu_system_counter; + ps->vmem_rss = (unsigned long) vmem_rss; + + *state = fields[2][0]; + + /* success */ + return (0); +} /* int ps_read_process (...) */ +#endif /* KERNEL_LINUX */ + +static void ps_read (void) +{ +#if HAVE_THREAD_INFO + kern_return_t status; + + int pset; + processor_set_t port_pset_priv; + + int task; + task_array_t task_list; + mach_msg_type_number_t task_list_len; + + int thread; + thread_act_array_t thread_list; + mach_msg_type_number_t thread_list_len; + thread_basic_info_data_t thread_data; + mach_msg_type_number_t thread_data_len; + + int running = 0; + int sleeping = 0; + int zombies = 0; + int stopped = 0; + int blocked = 0; + + /* + * The Mach-concept is a little different from the traditional UNIX + * concept: All the work is done in threads. Threads are contained in + * `tasks'. Therefore, `task status' doesn't make much sense, since + * it's actually a `thread status'. + * Tasks are assigned to sets of processors, so that's where you go to + * get a list. + */ + for (pset = 0; pset < pset_list_len; pset++) + { + if ((status = host_processor_set_priv (port_host_self, + pset_list[pset], + &port_pset_priv)) != KERN_SUCCESS) + { + syslog (LOG_ERR, "host_processor_set_priv failed: %s\n", + mach_error_string (status)); + continue; + } + + if ((status = processor_set_tasks (port_pset_priv, + &task_list, + &task_list_len)) != KERN_SUCCESS) + { + syslog (LOG_ERR, "processor_set_tasks failed: %s\n", + mach_error_string (status)); + mach_port_deallocate (port_task_self, port_pset_priv); + continue; + } + + for (task = 0; task < task_list_len; task++) + { + status = task_threads (task_list[task], &thread_list, + &thread_list_len); + if (status != KERN_SUCCESS) + { + /* Apple's `top' treats this case a zombie. It + * makes sense to some extend: A `zombie' + * thread is nonsense, since the task/process + * is dead. */ + zombies++; + DBG ("task_threads failed: %s", + mach_error_string (status)); + if (task_list[task] != port_task_self) + mach_port_deallocate (port_task_self, + task_list[task]); + continue; /* with next task_list */ + } + + for (thread = 0; thread < thread_list_len; thread++) + { + thread_data_len = THREAD_BASIC_INFO_COUNT; + status = thread_info (thread_list[thread], + THREAD_BASIC_INFO, + (thread_info_t) &thread_data, + &thread_data_len); + if (status != KERN_SUCCESS) + { + syslog (LOG_ERR, "thread_info failed: %s\n", + mach_error_string (status)); + if (task_list[task] != port_task_self) + mach_port_deallocate (port_task_self, + thread_list[thread]); + continue; /* with next thread_list */ + } + + switch (thread_data.run_state) + { + case TH_STATE_RUNNING: + running++; + break; + case TH_STATE_STOPPED: + /* What exactly is `halted'? */ + case TH_STATE_HALTED: + stopped++; + break; + case TH_STATE_WAITING: + sleeping++; + break; + case TH_STATE_UNINTERRUPTIBLE: + blocked++; + break; + /* There is no `zombie' case here, + * since there are no zombie-threads. + * There's only zombie tasks, which are + * handled above. */ + default: + syslog (LOG_WARNING, + "Unknown thread status: %s", + thread_data.run_state); + break; + } /* switch (thread_data.run_state) */ + + if (task_list[task] != port_task_self) + { + status = mach_port_deallocate (port_task_self, + thread_list[thread]); + if (status != KERN_SUCCESS) + syslog (LOG_ERR, "mach_port_deallocate failed: %s", + mach_error_string (status)); + } + } /* for (thread_list) */ + + if ((status = vm_deallocate (port_task_self, + (vm_address_t) thread_list, + thread_list_len * sizeof (thread_act_t))) + != KERN_SUCCESS) + { + syslog (LOG_ERR, "vm_deallocate failed: %s", + mach_error_string (status)); + } + thread_list = NULL; + thread_list_len = 0; + + /* Only deallocate the task port, if it isn't our own. + * Don't know what would happen in that case, but this + * is what Apple's top does.. ;) */ + if (task_list[task] != port_task_self) + { + status = mach_port_deallocate (port_task_self, + task_list[task]); + if (status != KERN_SUCCESS) + syslog (LOG_ERR, "mach_port_deallocate failed: %s", + mach_error_string (status)); + } + } /* 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", + mach_error_string (status)); + } + task_list = NULL; + task_list_len = 0; + + if ((status = mach_port_deallocate (port_task_self, port_pset_priv)) + != KERN_SUCCESS) + { + syslog (LOG_ERR, "mach_port_deallocate failed: %s", + mach_error_string (status)); + } + } /* for (pset_list) */ + + ps_submit (running, sleeping, zombies, stopped, -1, blocked); +/* #endif HAVE_THREAD_INFO */ + +#elif KERNEL_LINUX + int running = 0; + int sleeping = 0; + int zombies = 0; + int stopped = 0; + int paging = 0; + int blocked = 0; + + struct dirent *ent; + DIR *proc; + int pid; + + int status; + procstat_t ps; + procstat_entry_t pse; + char state; + + procstat_t *ps_ptr; + running = sleeping = zombies = stopped = paging = blocked = 0; + ps_list_reset (); if ((proc = opendir ("/proc")) == NULL) { @@ -99,27 +960,34 @@ void ps_read (void) if (!isdigit (ent->d_name[0])) continue; - if (snprintf (filename, 20, "/proc/%s/stat", ent->d_name) >= 20) + if ((pid = atoi (ent->d_name)) < 1) continue; - if ((fh = fopen (filename, "r")) == NULL) + status = ps_read_process (pid, &ps, &state); + if (status != 0) { - syslog (LOG_ERR, "Cannot open `%s': %s", filename, strerror (errno)); + DBG ("ps_read_process failed: %i", status); continue; } - if (fgets (buf, BUFSIZE, fh) == NULL) - { - fclose (fh); - continue; - } + pse.id = pid; + pse.age = 0; - fclose (fh); + pse.num_proc = ps.num_proc; + pse.num_lwp = ps.num_lwp; + pse.vmem_rss = ps.vmem_rss; - if (strsplit (buf, fields, 256) < 3) - continue; + pse.vmem_minflt = 0; + pse.vmem_minflt_counter = ps.vmem_minflt_counter; + pse.vmem_majflt = 0; + pse.vmem_majflt_counter = ps.vmem_majflt_counter; + + pse.cpu_user = 0; + pse.cpu_user_counter = ps.cpu_user_counter; + pse.cpu_system = 0; + pse.cpu_system_counter = ps.cpu_system_counter; - switch (fields[2][0]) + switch (state) { case 'R': running++; break; case 'S': sleeping++; break; @@ -128,19 +996,31 @@ void ps_read (void) case 'T': stopped++; break; case 'W': paging++; break; } + + ps_list_add (ps.name, &pse); } - closedir(proc); + closedir (proc); ps_submit (running, sleeping, zombies, stopped, paging, blocked); -#endif /* defined(KERNEL_LINUX) */ + + for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next) + ps_submit_proc_list (ps_ptr); +#endif /* KERNEL_LINUX */ } -#undef BUFSIZE +#else +# define ps_read NULL +#endif /* PROCESSES_HAVE_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); + cf_register (MODULE_NAME, ps_config, config_keys, config_keys_num); } +#undef BUFSIZE #undef MODULE_NAME -#endif /* COLLECT_PROCESSES */