X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=559ba972c81fe54d98fcc65225e8d1829f226912;hb=de0fdb208de123fe753c5fcf03533833777a5b4a;hp=5b244a6cda6da977f82ab5e6d04caa7e0601a2ce;hpb=d99dc6b0dc0f4f096ebb93c827a0cea2fd4e09e2;p=collectd.git

diff --git a/src/processes.c b/src/processes.c
index 5b244a6c..559ba972 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -1,8 +1,9 @@
 /**
  * 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
@@ -83,13 +84,6 @@
 #  ifndef CONFIG_HZ
 #    define CONFIG_HZ 100
 #  endif
-#  ifndef ARG_MAX
-#    if defined(HAVE_SYSCONF) && HAVE_SYSCONF && defined(_SC_ARG_MAX)
-#      define ARG_MAX sysconf(_SC_ARG_MAX)
-#    else
-#      define ARG_MAX 4096
-#    endif
-#  endif
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKVM_GETPROCS
@@ -109,6 +103,10 @@
 # include <regex.h>
 #endif
 
+#ifndef ARG_MAX
+#  define ARG_MAX 4096
+#endif
+
 #define BUFSIZE 256
 
 static const char *config_keys[] =
@@ -556,7 +554,6 @@ static void ps_submit_state (const char *state, double value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "processes", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
@@ -574,7 +571,6 @@ static void ps_submit_proc_list (procstat_t *ps)
 
 	vl.values = values;
 	vl.values_len = 2;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "processes", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, ps->name, sizeof (vl.plugin_instance));
@@ -826,7 +822,7 @@ static char *ps_get_cmdline (pid_t pid, char *name, char *buf, size_t buf_len)
 	n = 0;
 
 	while (42) {
-		size_t status;
+		ssize_t status;
 
 		status = read (fd, (void *)buf_ptr, len);
 
@@ -1362,7 +1358,9 @@ static int ps_read (void)
 		pse.num_proc = 1;
 		pse.num_lwp  = procs[i].ki_numthreads;
 
+		/* pse.vmem_size = procs[i].ki_size; */
 		pse.vmem_rss = procs[i].ki_rssize * getpagesize();
+		/* pse.stack_size = procs[i].ki_ssize * getpagesize(); */
 		pse.vmem_minflt = 0;
 		pse.vmem_minflt_counter = procs[i].ki_rusage.ru_minflt;
 		pse.vmem_majflt = 0;