strace/strace-sysinfo.diff

33 lines
1006 B
Diff
Raw Normal View History

resource.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
Index: resource.c
===================================================================
--- resource.c.orig 2005-10-28 14:04:55.000000000 +0200
+++ resource.c 2005-10-31 18:19:31.000000000 +0100
@@ -36,6 +36,7 @@
#ifdef LINUX
#include <sys/times.h>
#include <linux/kernel.h>
+#include <linux/version.h>
#include <sys/quota.h>
#endif /* LINUX */
#ifdef SUNOS4
@@ -386,10 +387,15 @@ struct tcb *tcp;
si.loads[2]);
tprintf("totalram=%lu, freeram=%lu, ",
si.totalram, si.freeram);
- tprintf("sharedram=%lu, bufferram=%lu} ",
+ tprintf("sharedram=%lu, bufferram=%lu, ",
si.sharedram, si.bufferram);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,48)
tprintf("totalswap=%lu, freeswap=%lu, procs=%hu}",
si.totalswap, si.freeswap, si.procs);
+#else
+ tprintf("totalswap=%lu, freeswap=%lu, procs=%hu, mem_unit=%u}",
+ si.totalswap, si.freeswap, si.procs, si.mem_unit);
+#endif
}
}
return 0;