summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c01301e)
raw | patch | inline | side by side (parent: c01301e)
author | Doug MacEachern <dougm@hyperic.com> | |
Mon, 4 May 2009 17:22:43 +0000 (19:22 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Mon, 4 May 2009 17:24:18 +0000 (19:24 +0200) |
Fixes:
processes.c: In function 'ps_read':
processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
processes.c:1300: note: 'pse.vmem_size' was declared here
processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
processes.c:1300: note: 'pse.stack_size' was declared here
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.
Conflicts:
src/processes.c
processes.c: In function 'ps_read':
processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
processes.c:1300: note: 'pse.vmem_size' was declared here
processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
processes.c:1300: note: 'pse.stack_size' was declared here
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.
Conflicts:
src/processes.c
src/processes.c | patch | blob | history |
diff --git a/src/processes.c b/src/processes.c
index 4a564214ddf002a04d53d51dc403e2efa2f0bab4..261accbcbc7582218c6f5744cb818beba533ffe8 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
pse.num_proc = 1;
pse.num_lwp = procs[i].ki_numthreads;
- /* pse.vmem_size = procs[i].ki_size; */
+ pse.vmem_size = procs[i].ki_size;
pse.vmem_rss = procs[i].ki_rssize * getpagesize();
- /* pse.stack_size = procs[i].ki_ssize * 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;