Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 19:44:09 +0000 (21:44 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 19:44:09 +0000 (21:44 +0200)
1  2 
src/processes.c
src/snmp.c

diff --cc 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) */
  
diff --cc src/snmp.c
Simple merge