From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 08:11:52 +0000 (+0100)
Subject: Merge branch 'libvirt-interfacenumber'
X-Git-Tag: collectd-5.2.0~15
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dff1246579ac6bea70331e560d2e1da0c7429b11;hp=-c;p=collectd.git

Merge branch 'libvirt-interfacenumber'
---

dff1246579ac6bea70331e560d2e1da0c7429b11
diff --combined src/libvirt.c
index e076891c,e63b179e..c53a81d4
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@@ -91,13 -91,14 +91,14 @@@ struct interface_device 
      virDomainPtr dom;           /* domain */
      char *path;                 /* name of interface device */
      char *address;              /* mac address of interface device */
+     char *number;               /* interface device number */
  };
  
  static struct interface_device *interface_devices = NULL;
  static int nr_interface_devices = 0;
  
  static void free_interface_devices (void);
- static int add_interface_device (virDomainPtr dom, const char *path, const char *address);
+ static int add_interface_device (virDomainPtr dom, const char *path, const char *address, unsigned int number);
  
  /* HostnameFormat. */
  #define HF_MAX_FIELDS 3
@@@ -115,7 -116,8 +116,8 @@@ static enum hf_field hostname_format[HF
  /* InterfaceFormat. */
  enum if_field {
      if_address,
-     if_name
+     if_name,
+     if_number
  };
  
  static enum if_field interface_format = if_name;
@@@ -139,6 -141,8 +141,6 @@@ init_value_list (value_list_t *vl, virD
      const char *name;
      char uuid[VIR_UUID_STRING_BUFLEN];
  
 -    vl->interval = interval_g;
 -
      sstrncpy (vl->plugin, "libvirt", sizeof (vl->plugin));
  
      vl->host[0] = '\0';
@@@ -346,6 -350,8 +348,8 @@@ lv_config (const char *key, const char 
              interface_format = if_name;
          else if (strcasecmp (value, "address") == 0)
              interface_format = if_address;
+         else if (strcasecmp (value, "number") == 0)
+             interface_format = if_number;
          else {
              ERROR ("unknown InterfaceFormat: %s", value);
              return -1;
@@@ -465,10 -471,20 +469,20 @@@ lv_read (void
      /* Get interface stats for each domain. */
      for (i = 0; i < nr_interface_devices; ++i) {
          struct _virDomainInterfaceStats stats;
-         char *display_name = interface_devices[i].path;
- 
-         if (interface_format == if_address)
-             display_name = interface_devices[i].address;
+         char *display_name = NULL;
+ 
+ 
+         switch (interface_format) {
+             case if_address:
+                 display_name = interface_devices[i].address;
+                 break;
+             case if_number:
+                 display_name = interface_devices[i].number;
+                 break;
+             case if_name:
+             default:
+                 display_name = interface_devices[i].path;
+         }
  
          if (virDomainInterfaceStats (interface_devices[i].dom,
                      interface_devices[i].path,
@@@ -642,7 -658,7 +656,7 @@@ refresh_lists (void
                       ignore_device_match (il_interface_devices, name, address) != 0))
                      goto cont3;
  
-                 add_interface_device (dom, path, address);
+                 add_interface_device (dom, path, address, j+1);
                  cont3:
                      if (path) xmlFree (path);
                      if (address) xmlFree (address);
@@@ -743,6 -759,7 +757,7 @@@ free_interface_devices (
          for (i = 0; i < nr_interface_devices; ++i) {
              sfree (interface_devices[i].path);
              sfree (interface_devices[i].address);
+             sfree (interface_devices[i].number);
          }
          sfree (interface_devices);
      }
@@@ -751,17 -768,22 +766,22 @@@
  }
  
  static int
- add_interface_device (virDomainPtr dom, const char *path, const char *address)
+ add_interface_device (virDomainPtr dom, const char *path, const char *address, unsigned int number)
  {
      struct interface_device *new_ptr;
      int new_size = sizeof (interface_devices[0]) * (nr_interface_devices+1);
-     char *path_copy, *address_copy;
+     char *path_copy, *address_copy, number_string[15];
  
      path_copy = strdup (path);
      if (!path_copy) return -1;
  
      address_copy = strdup (address);
-     if (!address_copy) return -1;
+     if (!address_copy) {
+         sfree(path_copy);
+         return -1;
+     }
+ 
+     snprintf(number_string, sizeof (number_string), "interface-%u", number);
  
      if (interface_devices)
          new_ptr = realloc (interface_devices, new_size);
@@@ -777,6 -799,7 +797,7 @@@
      interface_devices[nr_interface_devices].dom = dom;
      interface_devices[nr_interface_devices].path = path_copy;
      interface_devices[nr_interface_devices].address = address_copy;
+     interface_devices[nr_interface_devices].number = strdup(number_string);
      return nr_interface_devices++;
  }
  
@@@ -806,7 -829,7 +827,7 @@@ lv_shutdown (void
      free_domains ();
  
      if (conn != NULL)
- 	virConnectClose (conn);
+         virConnectClose (conn);
      conn = NULL;
  
      ignorelist_free (il_domains);
@@@ -823,8 -846,8 +844,8 @@@ voi
  module_register (void)
  {
      plugin_register_config ("libvirt",
- 	    lv_config,
- 	    config_keys, NR_CONFIG_KEYS);
+     lv_config,
+     config_keys, NR_CONFIG_KEYS);
      plugin_register_init ("libvirt", lv_init);
      plugin_register_read ("libvirt", lv_read);
      plugin_register_shutdown ("libvirt", lv_shutdown);