X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=f4ffef8f67ed49a2ddb459e95cce8ad154aa49f9;hb=ef7fec0c4e0bbbabb356e6a570ac6297ee06eb80;hp=67471341f8f6bd396ba9ecd4cd45e7639a3f5b10;hpb=afac1b5266656511fc09b01695f50d758d84d600;p=collectd.git diff --git a/src/processes.c b/src/processes.c index 67471341..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 @@ -247,13 +251,32 @@ static void ps_list_register (const char *name, const char *regexp) /* try to match name against entry, returns 1 if success */ static int ps_list_match (const char *name, const char *cmdline, procstat_t *ps) { - if ((ps->re != NULL) && (regexec(ps->re, (strlen(cmdline)!=0)?cmdline:name, 0, NULL, 0) == 0)) - return (1); - if (strcmp (ps->name, name) == 0) { - return (1); +#if HAVE_REGEX_H + if (ps->re != NULL) + { + int status; + const char *str; + + str = cmdline; + if ((str == NULL) || (str[0] == 0)) + str = name; + + 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); + 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) @@ -266,7 +289,6 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t for (ps = list_head_g; ps != NULL; ps = ps->next) { - if ((ps_list_match (name, cmdline, ps)) == 0) continue; @@ -426,33 +448,43 @@ static void ps_list_reset (void) /* put all pre-defined 'Process' names from config to list_head_g tree */ static int ps_config (const char *key, const char *value) { - char *new_val; - char *fields[2]; - int fields_num; - if (strcasecmp (key, "Process") == 0) { ps_list_register (value, NULL); - return (0); } - - if (strcasecmp (key, "ProcessMatch") == 0) + else if (strcasecmp (key, "ProcessMatch") == 0) { + char *new_val; + char *fields[3]; + int fields_num; + new_val = strdup (value); - if (new_val == NULL) - return (-1); - fields_num = strsplit (new_val, fields, 2); + 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); + return (1); } ps_list_register (fields[0], fields[1]); sfree (new_val); - return (0); + } + else + { + ERROR ("processes plugin: The `%s' configuration option is not " + "understood and will be ignored.", key); + return (-1); } - return (-1); + return (0); } static int ps_init (void) @@ -488,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 */ @@ -504,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); @@ -522,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; @@ -624,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; @@ -643,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) @@ -726,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 @@ -836,7 +955,8 @@ static int ps_read (void) { /* search for at least one match */ for (ps = list_head_g; ps != NULL; ps = ps->next) - if (ps_list_match(task_name, NULL, ps) == 1) //!!! cmdline should be here instead of NULL + /* FIXME: cmdline should be here instead of NULL */ + if (ps_list_match (task_name, NULL, ps) == 1) break; } @@ -957,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) */ @@ -996,7 +1116,8 @@ static int ps_read (void) } if (ps != NULL) - ps_list_add (task_name, NULL, &pse); //!!! cmdline should be here instead of NULL + /* 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, @@ -1039,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; @@ -1099,7 +1222,9 @@ static int ps_read (void) case 'W': paging++; break; } - ps_list_add (ps.name, NULL, &pse); //!!! cmdline should be here instead of NULL + ps_list_add (ps.name, + ps_get_cmdline (pid, ps.name, cmdline, sizeof (cmdline)), + &pse); } closedir (proc); @@ -1115,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; @@ -1127,10 +1252,11 @@ static int ps_read (void) kvm_t *kd; char errbuf[1024]; char cmdline[ARG_MAX]; + char *cmdline_ptr; struct kinfo_proc *procs; /* array of processes */ - char ** argv; + char **argv; int count; /* returns number of processes */ - int i, j; + int i; procstat_t *ps_ptr; procstat_entry_t pse; @@ -1138,32 +1264,54 @@ static int ps_read (void) ps_list_reset (); /* Open the kvm interface, get a descriptor */ - if ((kd = kvm_open(NULL, NULL, NULL, 0, errbuf)) == NULL) { - ERROR ("Cannot open kvm interface: %s", errbuf); + 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. */ - if ((procs = kvm_getprocs(kd, KERN_PROC_ALL, 0, &count)) == NULL) { - kvm_close(kd); - ERROR ("Cannot get kvm processes list: %s", kvm_geterr(kd)); + 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'; - argv = kvm_getargv(kd, (const struct kinfo_proc *) &(procs[i]), 0); - if (argv) { - j = 0; - while (argv[j] && strlen(cmdline) <= ARG_MAX) { - if (j) - strncat(cmdline, " ", 1); - strncat(cmdline, argv[j], strlen(argv[j])); - j++; + 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; @@ -1178,11 +1326,16 @@ static int ps_read (void) 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_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; + 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) { + switch (procs[i].ki_stat) + { case SSTOP: stopped++; break; case SSLEEP: sleeping++; break; case SRUN: running++; break; @@ -1192,10 +1345,10 @@ static int ps_read (void) case SZOMB: zombies++; break; } - ps_list_add (procs[i].ki_comm, cmdline, &pse); + ps_list_add (procs[i].ki_comm, cmdline_ptr, &pse); } - if (kd) kvm_close(kd); + kvm_close(kd); ps_submit_state ("running", running); ps_submit_state ("sleeping", sleeping); @@ -1207,8 +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 */