diff --git a/src/processes.c b/src/processes.c
index b022b461e84d07280666ae6020b93b5073dc84ff..545967233eefe4a4aa041cc18e3c198db06862bc 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
/**
* collectd - src/processes.c
* Copyright (C) 2005 Lyonel Vincent
- * Copyright (C) 2006-2007 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
* Authors:
* Lyonel Vincent <lyonel at ezix.org>
* Florian octo Forster <octo at verplant.org>
+ * Oleg King <king2 at kaluga.ru>
**/
#include "collectd.h"
/* 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)
@@ -264,7 +285,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;
/* 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);
+ return (1);
+ fields_num = strsplit (new_val, fields,
+ STATIC_ARRAY_SIZE (fields));
if (fields_num != 2)
{
sfree (new_val);
- return (-1);
+ return (1);
}
ps_list_register (fields[0], fields[1]);
sfree (new_val);
- return (0);
+ }
+ else
+ {
+ return (-1);
}
- return (-1);
+ return (0);
}
static int ps_init (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;
}
}
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,
case 'W': paging++; break;
}
- ps_list_add (ps.name, NULL, &pse); //!!! cmdline should be here instead of NULL
+ /* FIXME: cmdline should be here instead of NULL */
+ ps_list_add (ps.name, NULL, &pse);
}
closedir (proc);
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;
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;
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;
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);
for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list (ps_ptr);
-
#endif /* HAVE_LIBKVM */
return (0);