/* ------- 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 )
+ {
+ /* returns -1 => kernel 2.4 */
+ ps->num_lwp = 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 */
}
return buf;
} /* char *ps_get_cmdline (...) */
+
+static unsigned long read_fork_rate ()
+{
+ FILE *proc_stat;
+ char buf[1024];
+ unsigned long result = 0;
+ int numfields;
+ char *fields[3];
+
+ proc_stat = fopen("/proc/stat", "r");
+ if (proc_stat == NULL) {
+ char errbuf[1024];
+ ERROR ("processes plugin: fopen (/proc/stat) failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return ULONG_MAX;
+ }
+
+ while (fgets (buf, sizeof(buf), proc_stat) != NULL)
+ {
+ char *endptr;
+
+ numfields = strsplit(buf, fields, STATIC_ARRAY_SIZE (fields));
+ if (numfields != 2) {
+ ERROR ("processes plugin: processes in /proc/stat "
+ "contains more than 2 fields.");
+ continue;
+ }
+ if (strcmp ("processes", fields[0]) != 0)
+ continue;
+
+ errno = 0;
+ endptr = NULL;
+ result = strtoul(fields[1], &endptr, 10);
+ if ((endptr == fields[1]) || (errno != 0)) {
+ ERROR ("processes plugin: Cannot parse fork rate: %s",
+ fields[1]);
+ result = ULONG_MAX;
+ break;
+ }
+
+ break;
+ }
+
+ fclose(proc_stat);
+
+ return result;
+}
+
+static void ps_submit_fork_rate (unsigned long value)
+{
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
+
+ values[0].derive = (derive_t) value;
+
+ vl.values = values;
+ 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));
+ sstrncpy (vl.type_instance, "", sizeof (vl.type_instance));
+
+ plugin_dispatch_values (&vl);
+}
+
#endif /* KERNEL_LINUX */
#if HAVE_THREAD_INFO
procstat_entry_t pse;
char state;
+ unsigned long fork_rate;
+
procstat_t *ps_ptr;
running = sleeping = zombies = stopped = paging = blocked = 0;
for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
ps_submit_proc_list (ps_ptr);
+
+ fork_rate = read_fork_rate();
+ if (fork_rate != ULONG_MAX)
+ ps_submit_fork_rate(fork_rate);
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD