X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhugepages.c;h=f23a6e2a3db6ff294ecbe27ef80a2235b7429cd5;hb=936c450a86c841eea89888c8550c9118fae90c25;hp=8a2ad6a025d37376910c45ccdf8f63f702714707;hpb=d191bd9ecabcc93fa52abf6ce59a914ca9fdca10;p=collectd.git

diff --git a/src/hugepages.c b/src/hugepages.c
index 8a2ad6a0..f23a6e2a 100644
--- a/src/hugepages.c
+++ b/src/hugepages.c
@@ -25,9 +25,11 @@
  * Authors:
  *   Jaroslav Safka <jaroslavx.safka@intel.com>
  *   Kim-Marie Jones <kim-marie.jones@intel.com>
+ *   Florian Forster <octo at collectd.org>
  */
 
 #include "collectd.h"
+
 #include "common.h" /* auxiliary functions */
 #include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
 
@@ -36,9 +38,9 @@ static const char g_plugin_name[] = "hugepages";
 static _Bool g_flag_rpt_numa = 1;
 static _Bool g_flag_rpt_mm = 1;
 
-static _Bool values_pages = 1;
-static _Bool values_bytes = 0;
-static _Bool values_percent = 0;
+static _Bool g_values_pages = 1;
+static _Bool g_values_bytes = 0;
+static _Bool g_values_percent = 0;
 
 #define HP_HAVE_NR 0x01
 #define HP_HAVE_SURPLUS 0x02
@@ -64,11 +66,11 @@ static int hp_config(oconfig_item_t *ci) {
     else if (strcasecmp("ReportRootHP", child->key) == 0)
       cf_util_get_boolean(child, &g_flag_rpt_mm);
     else if (strcasecmp("ValuesPages", child->key) == 0)
-      cf_util_get_boolean(child, &values_pages);
+      cf_util_get_boolean(child, &g_values_pages);
     else if (strcasecmp("ValuesBytes", child->key) == 0)
-      cf_util_get_boolean(child, &values_bytes);
+      cf_util_get_boolean(child, &g_values_bytes);
     else if (strcasecmp("ValuesPercentage", child->key) == 0)
-      cf_util_get_boolean(child, &values_percent);
+      cf_util_get_boolean(child, &g_values_percent);
     else
       ERROR("%s: Invalid configuration option: \"%s\".", g_plugin_name,
             child->key);
@@ -80,10 +82,9 @@ static int hp_config(oconfig_item_t *ci) {
 static void submit_hp(const struct entry_info *info) {
   value_list_t vl = VALUE_LIST_INIT;
 
-  vl.values = &(value_t) { .gauge = NAN };
+  vl.values = &(value_t){.gauge = NAN};
   vl.values_len = 1;
 
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, g_plugin_name, sizeof(vl.plugin));
   if (info->node) {
     ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%zuKb",
@@ -99,19 +100,19 @@ static void submit_hp(const struct entry_info *info) {
   gauge_t free = info->free;
   gauge_t used = (info->nr + info->surplus) - info->free;
 
-  if (values_pages) {
+  if (g_values_pages) {
     sstrncpy(vl.type, "vmpage_number", sizeof(vl.type));
     plugin_dispatch_multivalue(&vl, /* store_percentage = */ 0, DS_TYPE_GAUGE,
                                "free", free, "used", used, NULL);
   }
-  if (values_bytes) {
+  if (g_values_bytes) {
     gauge_t page_size = (gauge_t)(1024 * info->page_size_kb);
     sstrncpy(vl.type, "memory", sizeof(vl.type));
     plugin_dispatch_multivalue(&vl, /* store_percentage = */ 0, DS_TYPE_GAUGE,
                                "free", free * page_size, "used",
                                used * page_size, NULL);
   }
-  if (values_percent) {
+  if (g_values_percent) {
     sstrncpy(vl.type, "percent", sizeof(vl.type));
     plugin_dispatch_multivalue(&vl, /* store_percentage = */ 1, DS_TYPE_GAUGE,
                                "free", free, "used", used, NULL);