/**
* collectd - src/processes.c
- * Copyright (C) 2005 Lyonel Vincent
- * Copyright (C) 2006-2008 Florian Forster (Mach code)
- * Copyright (C) 2008 Oleg King
+ * Copyright (C) 2005 Lyonel Vincent
+ * Copyright (C) 2006-2008 Florian octo Forster
+ * Copyright (C) 2008 Oleg King
+ * Copyright (C) 2009 Sebastian Harl
*
* 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
# endif
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
# include <kvm.h>
+# include <sys/param.h>
+# include <sys/sysctl.h>
# include <sys/user.h>
# include <sys/proc.h>
-# if HAVE_SYS_SYSCTL_H
-# include <sys/sysctl.h>
-# endif
-/* #endif HAVE_LIBKVM_GETPROCS */
+/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
#else
# error "No applicable input method."
static long pagesize_g;
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
/* no global variables */
-#endif /* HAVE_LIBKVM_GETPROCS */
+#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
/* put name of process from config to list_head_g tree
list_head_g is a list of 'procstat_t' structs with
pagesize_g, CONFIG_HZ);
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
/* no initialization */
-#endif /* HAVE_LIBKVM_GETPROCS */
+#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
return (0);
} /* int ps_init */
/* ------- additional functions for KERNEL_LINUX/HAVE_THREAD_INFO ------- */
#if KERNEL_LINUX
-static int *ps_read_tasks (int pid)
+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;
+ int count = 0;
ssnprintf (dirname, sizeof (dirname), "/proc/%i/task", pid);
if ((dh = opendir (dirname)) == NULL)
{
DEBUG ("Failed to open directory `%s'", dirname);
- return (NULL);
+ return (-1);
}
while ((ent = readdir (dh)) != NULL)
{
- if (!isdigit (ent->d_name[0]))
+ if (!isdigit ((int) 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);
- ERROR ("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++;
+ else
+ count++;
}
-
closedir (dh);
- if (list_len == 0)
- return (NULL);
-
- assert (list_len < list_size);
- assert (list[list_len] == 0);
-
- return (list);
+ return ((count >= 1) ? count : 1);
} /* int *ps_read_tasks */
int ps_read_process (int pid, procstat_t *ps, char *state)
char *fields[64];
char fields_len;
- int *tasks;
int i;
int ppid;
ps->num_lwp = 0;
ps->num_proc = 0;
}
- else if ((tasks = ps_read_tasks (pid)) == NULL)
- {
- /* Kernel 2.4 or so */
- ps->num_lwp = 1;
- ps->num_proc = 1;
- }
else
{
- ps->num_lwp = 0;
+ if ( (ps->num_lwp = ps_read_tasks (pid)) == -1 )
+ return (-1);
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 a zombi */
ps_submit_proc_list (ps_ptr);
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
int running = 0;
int sleeping = 0;
int zombies = 0;
for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list (ps_ptr);
-#endif /* HAVE_LIBKVM_GETPROCS */
+#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
return (0);
} /* int ps_read */