X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=f4ffef8f67ed49a2ddb459e95cce8ad154aa49f9;hb=ef7fec0c4e0bbbabb356e6a570ac6297ee06eb80;hp=545967233eefe4a4aa041cc18e3c198db06862bc;hpb=430b0b4d0275f7fea64376fc166e81fc0bcc36bf;p=collectd.git diff --git a/src/processes.c b/src/processes.c index 54596723..f4ffef8f 100644 --- a/src/processes.c +++ b/src/processes.c @@ -22,6 +22,7 @@ * Lyonel Vincent * Florian octo Forster * Oleg King + * Sebastian Harl **/ #include "collectd.h" @@ -84,14 +85,14 @@ # endif /* #endif KERNEL_LINUX */ -#elif HAVE_KVM_H +#elif HAVE_LIBKVM_GETPROCS # include # include # include # if HAVE_SYS_SYSCTL_H # include # endif -/* #endif HAVE_KVM_H */ +/* #endif HAVE_LIBKVM_GETPROCS */ #else # error "No applicable input method." @@ -106,8 +107,7 @@ static const char *config_keys[] = { "Process", - "ProcessMatch", - NULL + "ProcessMatch" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -167,7 +167,11 @@ static mach_msg_type_number_t pset_list_len; #elif KERNEL_LINUX static long pagesize_g; -#endif /* KERNEL_LINUX */ +/* #endif KERNEL_LINUX */ + +#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 @@ -455,12 +459,18 @@ static int ps_config (const char *key, const char *value) int fields_num; new_val = strdup (value); - if (new_val == NULL) + 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); } @@ -469,6 +479,8 @@ static int ps_config (const char *key, const char *value) } else { + ERROR ("processes plugin: The `%s' configuration option is not " + "understood and will be ignored.", key); return (-1); } @@ -508,7 +520,11 @@ static int ps_init (void) pagesize_g = sysconf(_SC_PAGESIZE); DEBUG ("pagesize_g = %li; CONFIG_HZ = %i;", pagesize_g, CONFIG_HZ); -#endif /* KERNEL_LINUX */ +/* #endif KERNEL_LINUX */ + +#elif HAVE_LIBKVM_GETPROCS +/* no initialization */ +#endif /* HAVE_LIBKVM_GETPROCS */ return (0); } /* int ps_init */ @@ -524,10 +540,10 @@ static void ps_submit_state (const char *state, double value) vl.values = values; vl.values_len = 1; vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "processes"); - strcpy (vl.plugin_instance, ""); - strcpy (vl.type, "ps_state"); + 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_dispatch_values (&vl); @@ -542,28 +558,28 @@ static void ps_submit_proc_list (procstat_t *ps) vl.values = values; vl.values_len = 2; vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "processes"); + 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)); - strcpy (vl.type, "ps_rss"); + sstrncpy (vl.type, "ps_rss", sizeof (vl.type)); vl.values[0].gauge = ps->vmem_rss; vl.values_len = 1; plugin_dispatch_values (&vl); - strcpy (vl.type, "ps_cputime"); + 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); - strcpy (vl.type, "ps_count"); + 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); - strcpy (vl.type, "ps_pagefaults"); + 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; @@ -644,7 +660,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; @@ -663,16 +678,10 @@ int ps_read_process (int pid, procstat_t *ps, char *state) ssnprintf (filename, sizeof (filename), "/proc/%i/stat", pid); - if ((fh = fopen (filename, "r")) == NULL) - return (-1); - - if (fgets (buffer, 1024, fh) == NULL) - { - fclose (fh); + i = read_file_contents (filename, buffer, sizeof(buffer) - 1); + if (i <= 0) return (-1); - } - - fclose (fh); + buffer[i] = 0; fields_len = strsplit (buffer, fields, 64); if (fields_len < 24) @@ -746,6 +755,96 @@ int ps_read_process (int pid, procstat_t *ps, char *state) /* 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) { + size_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 @@ -978,7 +1077,7 @@ static int ps_read (void) * There's only zombie tasks, which are * handled above. */ default: - WARNING ("Unknown thread status: %s", + WARNING ("Unknown thread status: %i", thread_data.run_state); break; } /* switch (thread_data.run_state) */ @@ -1061,6 +1160,8 @@ static int ps_read (void) DIR *proc; int pid; + char cmdline[ARG_MAX]; + int status; procstat_t ps; procstat_entry_t pse; @@ -1121,8 +1222,9 @@ static int ps_read (void) case 'W': paging++; break; } - /* FIXME: cmdline should be here instead of NULL */ - ps_list_add (ps.name, NULL, &pse); + ps_list_add (ps.name, + ps_get_cmdline (pid, ps.name, cmdline, sizeof (cmdline)), + &pse); } closedir (proc); @@ -1138,7 +1240,7 @@ static int ps_read (void) ps_submit_proc_list (ps_ptr); /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKVM +#elif HAVE_LIBKVM_GETPROCS int running = 0; int sleeping = 0; int zombies = 0; @@ -1258,7 +1360,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 */ +#endif /* HAVE_LIBKVM_GETPROCS */ return (0); } /* int ps_read */