Merge branch 'collectd-4.8' into collectd-4.9

diff --git a/ChangeLog b/ChangeLog
index 5aed2de..5c3542b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,7 +53,7 @@
          been added. “DERIVE” can be used for counters that are reset
          occasionally. Thanks to Mariusz Gronczewski for implementing this.
        * thresholds: The advanced threshold options “Percentage”, “Hits”, and
-         “Hysteresis” have been added. Thanks to Andrés J. Díaz for hit
+         “Hysteresis” have been added. Thanks to Andrés J. Díaz for his
          patches.
        * curl_json plugin: The new cURL-JSON plugin reads JSON files using
          the cURL library and parses the contents according to user

diff --git a/configure.in b/configure.in
index a11e3ba..8d0744a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3219,7 +3219,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])

diff --git a/contrib/collection3/README b/contrib/collection3/README
index 01d01bb..c890042 100644 (file)
--- a/contrib/collection3/README
+++ b/contrib/collection3/README
@@ -29,6 +29,7 @@ Dependencies
   distribution itself:
 
   * Config::General
+  * Regexp::Common
   * HTML::Entities
   * RRDs
 

diff --git a/src/memory.c b/src/memory.c
index ecaa0c0..b79a74b 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -158,10 +158,10 @@ static int memory_read (void)
        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);
@@ -195,10 +195,10 @@ static int memory_read (void)
         *   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);