X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=e1660c55455e63c4fe29ce040d8a45ec1652681b;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=0513a156a999d4330ca63599b176abc31b68682d;hpb=d061c270fabc5dba961cf2b94ebe968e9a89b899;p=collectd.git diff --git a/src/processes.c b/src/processes.c index 0513a156..e1660c55 100644 --- a/src/processes.c +++ b/src/processes.c @@ -170,13 +170,9 @@ typedef struct procstat_entry_s unsigned long vmem_code; unsigned long stack_size; - unsigned long vmem_minflt; - unsigned long vmem_majflt; derive_t vmem_minflt_counter; derive_t vmem_majflt_counter; - unsigned long cpu_user; - unsigned long cpu_system; derive_t cpu_user_counter; derive_t cpu_system_counter; @@ -185,9 +181,11 @@ typedef struct procstat_entry_s derive_t io_wchar; derive_t io_syscr; derive_t io_syscw; + _Bool has_io; derive_t cswitch_vol; derive_t cswitch_invol; + _Bool has_cswitch; struct procstat_entry_s *next; } procstat_entry_t; @@ -229,6 +227,7 @@ typedef struct procstat static procstat_t *list_head_g = NULL; +static _Bool want_init = 1; static _Bool report_ctx_switch = 0; #if HAVE_THREAD_INFO @@ -241,6 +240,7 @@ static mach_msg_type_number_t pset_list_len; #elif KERNEL_LINUX static long pagesize_g; +static void ps_fill_details (const procstat_t *ps, procstat_entry_t *entry); /* #endif KERNEL_LINUX */ #elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) @@ -366,25 +366,24 @@ static int ps_list_match (const char *name, const char *cmdline, procstat_t *ps) return (0); } /* int ps_list_match */ -static void ps_update_counter (_Bool init, derive_t *group_counter, - derive_t *curr_counter, unsigned long *curr_value, - derive_t new_counter, unsigned long new_value) +static void ps_update_counter (derive_t *group_counter, + derive_t *curr_counter, derive_t new_counter) { - if (init) + unsigned long curr_value; + + if (want_init) { - *curr_value = new_value; - *curr_counter += new_value; - *group_counter += new_value; + *curr_counter = new_counter; return; } if (new_counter < *curr_counter) - *curr_value = new_counter + (ULONG_MAX - *curr_counter); + curr_value = new_counter + (ULONG_MAX - *curr_counter); else - *curr_value = new_counter - *curr_counter; + curr_value = new_counter - *curr_counter; *curr_counter = new_counter; - *group_counter += *curr_value; + *group_counter += curr_value; } /* add process entry to 'instances' of process 'name' (or refresh it) */ @@ -397,11 +396,13 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t for (procstat_t *ps = list_head_g; ps != NULL; ps = ps->next) { - _Bool want_init; - if ((ps_list_match (name, cmdline, ps)) == 0) continue; +#if KERNEL_LINUX + ps_fill_details(ps, entry); +#endif + for (pse = ps->instances; pse != NULL; pse = pse->next) if ((pse->id == entry->id) || (pse->next == NULL)) break; @@ -454,27 +455,23 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t ps->cswitch_vol += ((pse->cswitch_vol == -1)?0:pse->cswitch_vol); ps->cswitch_invol += ((pse->cswitch_invol == -1)?0:pse->cswitch_invol); - want_init = (entry->vmem_minflt_counter == 0) - && (entry->vmem_majflt_counter == 0); - ps_update_counter (want_init, + ps_update_counter ( &ps->vmem_minflt_counter, - &pse->vmem_minflt_counter, &pse->vmem_minflt, - entry->vmem_minflt_counter, entry->vmem_minflt); - ps_update_counter (want_init, + &pse->vmem_minflt_counter, + entry->vmem_minflt_counter); + ps_update_counter ( &ps->vmem_majflt_counter, - &pse->vmem_majflt_counter, &pse->vmem_majflt, - entry->vmem_majflt_counter, entry->vmem_majflt); + &pse->vmem_majflt_counter, + entry->vmem_majflt_counter); - want_init = (entry->cpu_user_counter == 0) - && (entry->cpu_system_counter == 0); - ps_update_counter (want_init, + ps_update_counter ( &ps->cpu_user_counter, - &pse->cpu_user_counter, &pse->cpu_user, - entry->cpu_user_counter, entry->cpu_user); - ps_update_counter (want_init, + &pse->cpu_user_counter, + entry->cpu_user_counter); + ps_update_counter ( &ps->cpu_system_counter, - &pse->cpu_system_counter, &pse->cpu_system, - entry->cpu_system_counter, entry->cpu_system); + &pse->cpu_system_counter, + entry->cpu_system_counter); } } @@ -660,14 +657,10 @@ static int ps_init (void) /* submit global state (e.g.: qty of zombies, running, etc..) */ static void ps_submit_state (const char *state, double value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = value; - - vl.values = values; + vl.values = &(value_t) { .gauge = value }; 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)); @@ -679,12 +672,10 @@ static void ps_submit_state (const char *state, double value) /* submit info about specific process (e.g.: memory taken, cpu usage, etc..) */ static void ps_submit_proc_list (procstat_t *ps) { - value_t values[2]; value_list_t vl = VALUE_LIST_INIT; + value_t values[2]; 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)); @@ -784,14 +775,10 @@ static void ps_submit_proc_list (procstat_t *ps) #if KERNEL_LINUX || KERNEL_SOLARIS static void ps_submit_fork_rate (derive_t value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].derive = value; - - vl.values = values; + vl.values = &(value_t) { .derive = value }; 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, "fork_rate", sizeof (vl.type)); @@ -803,7 +790,7 @@ static void ps_submit_fork_rate (derive_t value) /* ------- additional functions for KERNEL_LINUX/HAVE_THREAD_INFO ------- */ #if KERNEL_LINUX -static procstat_t *ps_read_tasks_status (long pid, procstat_t *ps) +static int ps_read_tasks_status (procstat_entry_t *ps) { char dirname[64]; DIR *dh; @@ -816,12 +803,12 @@ static procstat_t *ps_read_tasks_status (long pid, procstat_t *ps) char *fields[8]; int numfields; - ssnprintf (dirname, sizeof (dirname), "/proc/%li/task", pid); + ssnprintf (dirname, sizeof (dirname), "/proc/%li/task", ps->id); if ((dh = opendir (dirname)) == NULL) { DEBUG ("Failed to open directory `%s'", dirname); - return (NULL); + return (-1); } while ((ent = readdir (dh)) != NULL) @@ -833,7 +820,7 @@ static procstat_t *ps_read_tasks_status (long pid, procstat_t *ps) tpid = ent->d_name; - ssnprintf (filename, sizeof (filename), "/proc/%li/task/%s/status", pid, tpid); + ssnprintf (filename, sizeof (filename), "/proc/%li/task/%s/status", ps->id, tpid); if ((fh = fopen (filename, "r")) == NULL) { DEBUG ("Failed to open file `%s'", filename); @@ -883,7 +870,7 @@ static procstat_t *ps_read_tasks_status (long pid, procstat_t *ps) ps->cswitch_vol = cswitch_vol; ps->cswitch_invol = cswitch_invol; - return (ps); + return (0); } /* int *ps_read_tasks_status */ /* Read data from /proc/pid/status */ @@ -957,7 +944,7 @@ static procstat_t *ps_read_status (long pid, procstat_t *ps) return (ps); } /* procstat_t *ps_read_vmem */ -static procstat_t *ps_read_io (long pid, procstat_t *ps) +static int ps_read_io (procstat_entry_t *ps) { FILE *fh; char buffer[1024]; @@ -966,9 +953,9 @@ static procstat_t *ps_read_io (long pid, procstat_t *ps) char *fields[8]; int numfields; - ssnprintf (filename, sizeof (filename), "/proc/%li/io", pid); + ssnprintf (filename, sizeof (filename), "/proc/%li/io", ps->id); if ((fh = fopen (filename, "r")) == NULL) - return (NULL); + return (-1); while (fgets (buffer, sizeof (buffer), fh) != NULL) { @@ -1008,9 +995,36 @@ static procstat_t *ps_read_io (long pid, procstat_t *ps) WARNING ("processes: fclose: %s", sstrerror (errno, errbuf, sizeof (errbuf))); } + return (0); +} /* int ps_read_io (...) */ - return (ps); -} /* procstat_t *ps_read_io */ +static void ps_fill_details (const procstat_t *ps, procstat_entry_t *entry) +{ + if ( entry->has_io == 0 && ps_read_io (entry) != 0 ) + { + /* no io data */ + entry->io_rchar = -1; + entry->io_wchar = -1; + entry->io_syscr = -1; + entry->io_syscw = -1; + + DEBUG("ps_read_process: not get io data for pid %li", entry->id); + } + entry->has_io = 1; + + if ( report_ctx_switch ) + { + if ( entry->has_cswitch == 0 && ps_read_tasks_status(entry) != 0 ) + { + entry->cswitch_vol = -1; + entry->cswitch_invol = -1; + + DEBUG("ps_read_tasks_status: not get context " + "switch data for pid %li", entry->id); + } + entry->has_cswitch = 1; + } +} /* void ps_fill_details (...) */ static int ps_read_process (long pid, procstat_t *ps, char *state) { @@ -1143,29 +1157,6 @@ static int ps_read_process (long pid, procstat_t *ps, char *state) ps->vmem_rss = (unsigned long) vmem_rss; ps->stack_size = (unsigned long) stack_size; - if ( (ps_read_io (pid, ps)) == NULL) - { - /* no io data */ - ps->io_rchar = -1; - ps->io_wchar = -1; - ps->io_syscr = -1; - ps->io_syscw = -1; - - DEBUG("ps_read_process: not get io data for pid %li", pid); - } - - if ( report_ctx_switch ) - { - if ( (ps_read_tasks_status(pid, ps)) == NULL) - { - ps->cswitch_vol = -1; - ps->cswitch_invol = -1; - - DEBUG("ps_read_tasks_status: not get context " - "switch data for pid %li", pid); - } - } - /* success */ return (0); } /* int ps_read_process (...) */ @@ -1854,14 +1845,10 @@ static int ps_read (void) pse.vmem_code = ps.vmem_code; pse.stack_size = ps.stack_size; - 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; pse.io_rchar = ps.io_rchar; @@ -1986,13 +1973,9 @@ static int ps_read (void) pse.vmem_data = procs[i].ki_dsize * pagesize; pse.vmem_code = procs[i].ki_tsize * pagesize; pse.stack_size = procs[i].ki_ssize * pagesize; - 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_system = 0; pse.cpu_user_counter = 0; pse.cpu_system_counter = 0; /* @@ -2132,13 +2115,9 @@ static int ps_read (void) pse.vmem_code = procs[i].p_vm_tsize * pagesize; pse.stack_size = procs[i].p_vm_ssize * pagesize; pse.vmem_size = pse.stack_size + pse.vmem_code + pse.vmem_data; - pse.vmem_minflt = 0; pse.vmem_minflt_counter = procs[i].p_uru_minflt; - pse.vmem_majflt = 0; pse.vmem_majflt_counter = procs[i].p_uru_majflt; - pse.cpu_user = 0; - pse.cpu_system = 0; pse.cpu_user_counter = procs[i].p_uutime_usec + (1000000lu * procs[i].p_uutime_sec); pse.cpu_system_counter = procs[i].p_ustime_usec + @@ -2270,7 +2249,6 @@ static int ps_read (void) break; } - pse.cpu_user = 0; /* tv_usec is nanosec ??? */ pse.cpu_user_counter = procentry[i].pi_ru.ru_utime.tv_sec * 1000000 + procentry[i].pi_ru.ru_utime.tv_usec / 1000; @@ -2280,9 +2258,7 @@ static int ps_read (void) pse.cpu_system_counter = procentry[i].pi_ru.ru_stime.tv_sec * 1000000 + procentry[i].pi_ru.ru_stime.tv_usec / 1000; - pse.vmem_minflt = 0; pse.vmem_minflt_counter = procentry[i].pi_minflt; - pse.vmem_majflt = 0; pse.vmem_majflt_counter = procentry[i].pi_majflt; pse.vmem_size = procentry[i].pi_tsize + procentry[i].pi_dvm * pagesize; @@ -2380,14 +2356,10 @@ static int ps_read (void) pse.vmem_code = ps.vmem_code; pse.stack_size = ps.stack_size; - 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; pse.io_rchar = ps.io_rchar; @@ -2432,6 +2404,8 @@ static int ps_read (void) read_fork_rate(); #endif /* KERNEL_SOLARIS */ + want_init = 0; + return (0); } /* int ps_read */