author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 15 Dec 2009 12:11:25 +0000 (13:11 +0100) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 15 Dec 2009 12:11:25 +0000 (13:11 +0100) |
configure.in | patch | blob | history | |
contrib/collection3/README | patch | blob | history | |
src/memory.c | patch | blob | history |
diff --git a/configure.in b/configure.in
index 589ff75bb159b8051a715c5d9e5f1d68e885c045..89bdeaa2d8397a4045dce8ce528769b78a81630c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2912,7 +2912,7 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@],
with_libupsclient="use_libupsclient_config"
else if test -x "$withval/bin/libupsclient-config"
then
- with_libupsclient_config="$withval/bin/net-snmp-config"
+ with_libupsclient_config="$withval/bin/libupsclient-config"
with_libupsclient="use_libupsclient_config"
else
AC_MSG_NOTICE([Not checking for libupsclient: Manually configured])
index 01d01bb733045a29f6e3159ae92fe678f41c1b4d..c890042c92234209b24322f2065894650938872d 100644 (file)
distribution itself:
* Config::General
+ * Regexp::Common
* HTML::Entities
* RRDs
diff --git a/src/memory.c b/src/memory.c
index 799a80c31684c963172fa89363e9f931c24f4886..b2da5efaa35b6c3ce17984932df451ac2184c23d 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
vm_statistics_data_t vm_data;
mach_msg_type_number_t vm_data_len;
- long long wired;
- long long active;
- long long inactive;
- long long free;
+ gauge_t wired;
+ gauge_t active;
+ gauge_t inactive;
+ gauge_t free;
if (!port_host || !pagesize)
return (-1);
* This memory is not being used.
*/
- wired = vm_data.wire_count * pagesize;
- active = vm_data.active_count * pagesize;
- inactive = vm_data.inactive_count * pagesize;
- free = vm_data.free_count * pagesize;
+ wired = (gauge_t) (((uint64_t) vm_data.wire_count) * ((uint64_t) pagesize));
+ active = (gauge_t) (((uint64_t) vm_data.active_count) * ((uint64_t) pagesize));
+ inactive = (gauge_t) (((uint64_t) vm_data.inactive_count) * ((uint64_t) pagesize));
+ free = (gauge_t) (((uint64_t) vm_data.free_count) * ((uint64_t) pagesize));
memory_submit ("wired", wired);
memory_submit ("active", active);