X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=5f67abaa12dd879072ccc4e794e575fc241146a9;hb=b3facabd3ed3fa40c81a8122b78daffbbbdf34a6;hp=8337f99a735137fa6ff799e104a7a6fe5b48303f;hpb=c327b3ae6b19713a56631e81886988121d3eef93;p=collectd.git

diff --git a/src/processes.c b/src/processes.c
index 8337f99a..5f67abaa 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -634,14 +634,14 @@ static int ps_read_tasks (int pid)
 
 	while ((ent = readdir (dh)) != NULL)
 	{
-		if (!isdigit (ent->d_name[0]))
+		if (!isdigit ((int) ent->d_name[0]))
 			continue;
 		else
 			count++;
 	}
 	closedir (dh);
 
-	return (count?count:1);
+	return ((count >= 1) ? count : 1);
 } /* int *ps_read_tasks */
 
 int ps_read_process (int pid, procstat_t *ps, char *state)
@@ -704,7 +704,10 @@ int ps_read_process (int pid, procstat_t *ps, char *state)
 	else
 	{
 		if ( (ps->num_lwp = ps_read_tasks (pid)) == -1 )
-			return (-1);
+		{
+			/* returns -1 => kernel 2.4 */
+			ps->num_lwp = 1;
+		}
 		ps->num_proc = 1;
 	}
 
@@ -836,6 +839,70 @@ static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len)
 	}
 	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)
+			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
@@ -1158,6 +1225,8 @@ static int ps_read (void)
 	procstat_entry_t pse;
 	char       state;
 
+	unsigned long fork_rate;
+
 	procstat_t *ps_ptr;
 
 	running = sleeping = zombies = stopped = paging = blocked = 0;
@@ -1231,6 +1300,10 @@ 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);
+
+	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