X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=856296cc896ab6c4f66e5d67559ab2833b0efe86;hb=c089c920528313b72a535dabfcdbd91a66c8d977;hp=8c7700af6fa5670eded43dc82b253db79acdf74a;hpb=9622e4d30f90e9eefca1d43fefc6bf85785074d3;p=collectd.git

diff --git a/src/processes.c b/src/processes.c
index 8c7700af..856296cc 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -150,10 +150,10 @@ typedef struct procstat_entry_s
 	unsigned long cpu_system_counter;
 
 	/* io data */
-	long io_rchar;
-	long io_wchar;
-	long io_syscr;
-	long io_syscw;
+	derive_t io_rchar;
+	derive_t io_wchar;
+	derive_t io_syscr;
+	derive_t io_syscw;
 
 	struct procstat_entry_s *next;
 } procstat_entry_t;
@@ -179,10 +179,10 @@ typedef struct procstat
 	unsigned long cpu_system_counter;
 
 	/* io data */
-	long io_rchar;
-	long io_wchar;
-	long io_syscr;
-	long io_syscw;
+	derive_t io_rchar;
+	derive_t io_wchar;
+	derive_t io_syscr;
+	derive_t io_syscw;
 
 	struct procstat   *next;
 	struct procstat_entry_s *instances;
@@ -262,7 +262,7 @@ static void ps_list_register (const char *name, const char *regexp)
 		ERROR ("processes plugin: ps_list_register: "
 				"Regular expression \"%s\" found in config "
 				"file, but support for regular expressions "
-				"has been dispabled at compile time.",
+				"has been disabled at compile time.",
 				regexp);
 		sfree (new);
 		return;
@@ -664,8 +664,8 @@ static void ps_submit_proc_list (procstat_t *ps)
 	if ( (ps->io_rchar != -1) && (ps->io_wchar != -1) )
 	{
 		sstrncpy (vl.type, "ps_disk_octets", sizeof (vl.type));
-		vl.values[0].counter = ps->io_rchar;
-		vl.values[1].counter = ps->io_wchar;
+		vl.values[0].derive = ps->io_rchar;
+		vl.values[1].derive = ps->io_wchar;
 		vl.values_len = 2;
 		plugin_dispatch_values (&vl);
 	}
@@ -673,8 +673,8 @@ static void ps_submit_proc_list (procstat_t *ps)
 	if ( (ps->io_syscr != -1) && (ps->io_syscw != -1) )
 	{
 		sstrncpy (vl.type, "ps_disk_ops", sizeof (vl.type));
-		vl.values[0].counter = ps->io_syscr;
-		vl.values[1].counter = ps->io_syscw;
+		vl.values[0].derive = ps->io_syscr;
+		vl.values[1].derive = ps->io_syscw;
 		vl.values_len = 2;
 		plugin_dispatch_values (&vl);
 	}
@@ -682,8 +682,8 @@ static void ps_submit_proc_list (procstat_t *ps)
 	DEBUG ("name = %s; num_proc = %lu; num_lwp = %lu; vmem_rss = %lu; "
 			"vmem_minflt_counter = %lu; vmem_majflt_counter = %lu; "
 			"cpu_user_counter = %lu; cpu_system_counter = %lu; "
-			"io_rchar = %ld; io_wchar = %ld; "
-			"io_syscr = %ld; io_syscw = %ld;",
+			"io_rchar = %"PRIi64"; io_wchar = %"PRIi64"; "
+			"io_syscr = %"PRIi64"; io_syscw = %"PRIi64";",
 			ps->name, ps->num_proc, ps->num_lwp, ps->vmem_rss,
 			ps->vmem_minflt_counter, ps->vmem_majflt_counter,
 			ps->cpu_user_counter, ps->cpu_system_counter,
@@ -734,7 +734,9 @@ static procstat_t *ps_read_io (int pid, procstat_t *ps)
 
 	while (fgets (buffer, 1024, fh) != NULL)
 	{
-		long *val = NULL;
+		derive_t *val = NULL;
+		long long tmp;
+		char *endptr;
 
 		if (strncasecmp (buffer, "rchar:", 6) == 0)
 			val = &(ps->io_rchar);
@@ -752,8 +754,14 @@ static procstat_t *ps_read_io (int pid, procstat_t *ps)
 		if (numfields < 2)
 			continue;
 
-		*val = atol (fields[1]);
-	}
+		errno = 0;
+		endptr = NULL;
+		tmp = strtoll (fields[1], &endptr, /* base = */ 10);
+		if ((errno != 0) || (endptr == fields[1]))
+			*val = -1;
+		else
+			*val = (derive_t) tmp;
+	} /* while (fgets) */
 
 	if (fclose (fh))
 	{
@@ -895,13 +903,18 @@ static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len)
 	if ((pid < 1) || (NULL == buf) || (buf_len < 2))
 		return NULL;
 
-	ssnprintf (file, sizeof (file), "/proc/%u/cmdline", pid);
+	ssnprintf (file, sizeof (file), "/proc/%u/cmdline",
+		       	(unsigned int) pid);
 
+	errno = 0;
 	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)));
+		/* ENOENT means the process exited while we were handling it.
+		 * Don't complain about this, it only fills the logs. */
+		if (errno != ENOENT)
+			WARNING ("processes plugin: Failed to open `%s': %s.", file,
+					sstrerror (errno, errbuf, sizeof (errbuf)));
 		return NULL;
 	}
 
@@ -916,7 +929,7 @@ static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len)
 		status = read (fd, (void *)buf_ptr, len);
 
 		if (status < 0) {
-			char errbuf[4096];
+			char errbuf[1024];
 
 			if ((EAGAIN == errno) || (EINTR == errno))
 				continue;
@@ -1682,6 +1695,11 @@ static int ps_read (void)
 			pse.vmem_rss = (procentry[i].pi_drss + procentry[i].pi_trss) * pagesize;
 			pse.stack_size =  0;
 
+			pse.io_rchar = -1;
+			pse.io_wchar = -1;
+			pse.io_syscr = -1;
+			pse.io_syscw = -1;
+
 			ps_list_add (cmdline, cargs, &pse);
 		} /* for (i = 0 .. nprocs) */