Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	ChangeLog
	src/libvirt.c
	src/plugin.c
	src/plugin.h
	version-gen.sh

diff --git a/ChangeLog b/ChangeLog
index 95a3e71..b670f15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,24 @@ yyyy-mm-dd, Version 5.0.0
        * v5upgrade target: Target for converting v4 data sets to the v5
          schema.
 
+2011-03-26, Version 4.10.3
+       * Documentation: Several updates and additions. Thanks to Sebastian Harl.
+       * collectd: Build issues (compiler warnings) have been fixed. Thanks to
+         Bruno Prémont.
+       * collectd: Threshold subsection: Handling of NAN values in the
+         percentage calculation has been fixed.
+       * collectd, java plugin, ntpd plugin: Several diagnostic messages have
+         been improved.
+       * curl_json plugin: Handling of arrays has been fixed.
+       * libvirt plugin: A bug in reading the virtual CPU statistics has been
+         fixed. Thanks to “JLPC” for reporting this problem.
+       * modbus plugin: Compatibility with libmodbus 2.0.3 has been restored.
+       * processes plugin: Potentially erroneous behavior has been fixed in an
+         error handling case.
+       * python plugin: Fix dispatching of values from Python scripts to
+         collectd. Thanks to Gregory Szorc for finding and fixing this
+         problem.
+
 2010-11-27, Version 4.10.2
        * Documentation: Various documentation fixes.
        * collectd: If including one configuration file fails, continue with
@@ -176,6 +194,22 @@ yyyy-mm-dd, Version 5.0.0
        * regex match: The "Invert" option has been added. Thanks to Julien
          Ammous for his patch.
 
+2011-03-26, Version 4.9.5
+       * Documentation: Several updates and additions. Thanks to Sebastian Harl.
+       * collectd: Build issues (compiler warnings) have been fixed. Thanks to
+         Bruno Prémont.
+       * collectd: Threshold subsection: Handling of NAN values in the
+         percentage calculation has been fixed.
+       * collectd, java plugin, ntpd plugin: Several diagnostic messages have
+         been improved.
+       * libvirt plugin: A bug in reading the virtual CPU statistics has been
+         fixed. Thanks to “JLPC” for reporting this problem.
+       * processes plugin: Potentially erroneous behavior has been fixed in an
+         error handling case.
+       * python plugin: Fix dispatching of values from Python scripts to
+         collectd. Thanks to Gregory Szorc for finding and fixing this
+         problem.
+
 2010-11-27, Version 4.9.4
        * Documentation: Various documentation fixes.
        * collectd: If including one configuration file fails, continue with

diff --git a/src/libvirt.c b/src/libvirt.c
index b5e7e99..c74b937 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -413,22 +413,32 @@ lv_read (void)
     for (i = 0; i < nr_domains; ++i) {
         virDomainInfo info;
         virVcpuInfoPtr vinfo = NULL;
+        int status;
         int j;
 
-        if (virDomainGetInfo (domains[i], &info) != 0)
+        status = virDomainGetInfo (domains[i], &info);
+        if (status != 0)
+        {
+            ERROR ("libvirt plugin: virDomainGetInfo failed with status %i.",
+                    status);
             continue;
+        }
 
         cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
 
-        vinfo = malloc (info.nrVirtCpu * sizeof vinfo[0]);
+        vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
         if (vinfo == NULL) {
             ERROR ("libvirt plugin: malloc failed.");
             continue;
         }
 
-        if (virDomainGetVcpus (domains[i], vinfo, info.nrVirtCpu,
-                    NULL, 0) != 0) {
-            sfree (vinfo);
+        status = virDomainGetVcpus (domains[i], vinfo, info.nrVirtCpu,
+                /* cpu map = */ NULL, /* cpu map length = */ 0);
+        if (status < 0)
+        {
+            ERROR ("libvirt plugin: virDomainGetVcpus failed with status %i.",
+                    status);
+            free (vinfo);
             continue;
         }
 

diff --git a/src/plugin.c b/src/plugin.c
index 099990d..89a2e00 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -872,7 +872,7 @@ int plugin_register_missing (const char *name,
                                (void *) callback, ud));
 } /* int plugin_register_missing */
 
-int plugin_register_shutdown (char *name,
+int plugin_register_shutdown (const char *name,
                int (*callback) (void))
 {
        return (create_register_callback (&list_shutdown, name,

diff --git a/src/plugin.h b/src/plugin.h
index 4d5201b..e880472 100644 (file)
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -281,7 +281,7 @@ int plugin_register_flush (const char *name,
                plugin_flush_cb callback, user_data_t *user_data);
 int plugin_register_missing (const char *name,
                plugin_missing_cb callback, user_data_t *user_data);
-int plugin_register_shutdown (char *name,
+int plugin_register_shutdown (const char *name,
                plugin_shutdown_cb callback);
 int plugin_register_data_set (const data_set_t *ds);
 int plugin_register_log (const char *name,