amqp, write_graphite and write_kafka plugins: Implement the "[Graphite]PreserveSepara...

[collectd.git] / src / lpar.c

diff --git a/src/lpar.c b/src/lpar.c
index d25715e..69a56e1 100644 (file)
--- a/src/lpar.c
+++ b/src/lpar.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -34,7 +35,7 @@
                    (double)(_system_configuration.Xfrac))
 #endif
 
-#define NS_TO_TICKS(ns) ((ns) / XINTFRAC)
+#define CLOCKTICKS_TO_TICKS(cticks) ((cticks) / XINTFRAC)
 
 static const char *config_keys[] =
 {
@@ -113,22 +114,15 @@ static int lpar_init (void)
 
 static void lpar_submit (const char *type_instance, double value)
 {
-       value_t values[1];
        value_list_t vl = VALUE_LIST_INIT;
 
-       values[0].gauge = (gauge_t)value;
-
-       vl.values = values;
+       vl.values = &(value_t) { .gauge = value };
        vl.values_len = 1;
        if (report_by_serial)
        {
                sstrncpy (vl.host, serial, sizeof (vl.host));
                sstrncpy (vl.plugin_instance, hostname_g, sizeof (vl.plugin));
        }
-       else
-       {
-               sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-       }
        sstrncpy (vl.plugin, "lpar", sizeof (vl.plugin));
        sstrncpy (vl.type, "vcpu", sizeof (vl.type));
        sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
@@ -236,15 +230,15 @@ static int lpar_read (void)
        if (pool_stats)
        {
                char typinst[DATA_MAX_NAME_LEN];
-               u_longlong_t pool_idle_ns;
+               u_longlong_t pool_idle_cticks;
                double pool_idle_cpus;
                double pool_busy_cpus;
 
                /* We're calculating "busy" from "idle" and the total number of
                 * CPUs, because the "busy" member didn't exist in early versions
                 * of libperfstat. It was added somewhere between AIX 5.3 ML5 and ML9. */
-               pool_idle_ns = lparstats.pool_idle_time - lparstats_old.pool_idle_time;
-               pool_idle_cpus = NS_TO_TICKS ((double) pool_idle_ns) / (double) ticks;
+               pool_idle_cticks = lparstats.pool_idle_time - lparstats_old.pool_idle_time;
+               pool_idle_cpus = CLOCKTICKS_TO_TICKS ((double) pool_idle_cticks) / (double) ticks;
                pool_busy_cpus = ((double) lparstats.phys_cpus_pool) - pool_idle_cpus;
                if (pool_busy_cpus < 0.0)
                        pool_busy_cpus = 0.0;