From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 13 Jun 2010 19:44:09 +0000 (+0200)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-4.10.1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2bdaa472d6955a8c93c6aa77f11748d4c611558e;p=collectd.git

Merge branch 'collectd-4.9' into collectd-4.10
---

2bdaa472d6955a8c93c6aa77f11748d4c611558e
diff --cc src/processes.c
index c642e58a,670aa8d7..8a3df644
--- a/src/processes.c
+++ b/src/processes.c
@@@ -1792,11 -1688,13 +1792,16 @@@ static int ps_read (void
  
  			pse.vmem_size = procentry[i].pi_tsize + procentry[i].pi_dvm * pagesize;
  			pse.vmem_rss = (procentry[i].pi_drss + procentry[i].pi_trss) * pagesize;
 +			/* Not supported */
 +			pse.vmem_data = 0;
 +			pse.vmem_code = 0;
  			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) */