**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
-#include "utils_ignorelist.h"
#include "utils_complain.h"
+#include "utils_ignorelist.h"
+#include <libgen.h> /* for basename(3) */
#include <libvirt/libvirt.h>
#include <libvirt/virterror.h>
#include <libxml/parser.h>
/* Plugin name */
#define PLUGIN_NAME "virt"
-static const char *config_keys[] = {
- "Connection",
+static const char *config_keys[] = {"Connection",
- "RefreshInterval",
+ "RefreshInterval",
- "Domain",
- "BlockDevice",
- "InterfaceDevice",
- "IgnoreSelected",
+ "Domain",
+ "BlockDevice",
+ "BlockDeviceFormat",
+ "BlockDeviceFormatBasename",
+ "InterfaceDevice",
+ "IgnoreSelected",
- "HostnameFormat",
- "InterfaceFormat",
+ "HostnameFormat",
+ "InterfaceFormat",
- "PluginInstanceFormat",
+ "PluginInstanceFormat",
- NULL
-};
+ NULL};
#define NR_CONFIG_KEYS ((sizeof config_keys / sizeof config_keys[0]) - 1)
/* Connection. */
/* List of network interface devices, if specified. */
static ignorelist_t *il_interface_devices = NULL;
-static int ignore_device_match (ignorelist_t *,
- const char *domname, const char *devpath);
+static int ignore_device_match(ignorelist_t *, const char *domname,
+ const char *devpath);
/* Actual list of domains found on last refresh. */
static virDomainPtr *domains = NULL;
static int nr_domains = 0;
-static void free_domains (void);
-static int add_domain (virDomainPtr dom);
+static void free_domains(void);
+static int add_domain(virDomainPtr dom);
/* Actual list of block devices found on last refresh. */
struct block_device {
- virDomainPtr dom; /* domain */
- char *path; /* name of block device */
+ virDomainPtr dom; /* domain */
+ char *path; /* name of block device */
};
static struct block_device *block_devices = NULL;
static int nr_block_devices = 0;
-static void free_block_devices (void);
-static int add_block_device (virDomainPtr dom, const char *path);
+static void free_block_devices(void);
+static int add_block_device(virDomainPtr dom, const char *path);
/* Actual list of network interfaces found on last refresh. */
struct interface_device {
- virDomainPtr dom; /* domain */
- char *path; /* name of interface device */
- char *address; /* mac address of interface device */
- char *number; /* interface device number */
+ 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, unsigned int number);
+static void free_interface_devices(void);
+static int add_interface_device(virDomainPtr dom, const char *path,
+ const char *address, unsigned int number);
/* HostnameFormat. */
#define HF_MAX_FIELDS 3
-enum hf_field {
- hf_none = 0,
- hf_hostname,
- hf_name,
- hf_uuid
-};
+enum hf_field { hf_none = 0, hf_hostname, hf_name, hf_uuid };
-static enum hf_field hostname_format[HF_MAX_FIELDS] =
- { hf_name };
+static enum hf_field hostname_format[HF_MAX_FIELDS] = {hf_name};
/* PluginInstanceFormat */
#define PLGINST_MAX_FIELDS 2
-enum plginst_field {
- plginst_none = 0,
- plginst_name,
- plginst_uuid
-};
+enum plginst_field { plginst_none = 0, plginst_name, plginst_uuid };
+
+static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] = {
+ plginst_none};
-static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] =
- { plginst_none };
+/* BlockDeviceFormat */
+enum bd_field { target, source };
/* InterfaceFormat. */
-enum if_field {
- if_address,
- if_name,
- if_number
-};
+enum if_field { if_address, if_name, if_number };
+/* BlockDeviceFormatBasename */
+_Bool blockdevice_format_basename = 0;
+static enum bd_field blockdevice_format = target;
static enum if_field interface_format = if_name;
/* Time that we last refreshed. */
-static time_t last_refresh = (time_t) 0;
+static time_t last_refresh = (time_t)0;
-static int refresh_lists (void);
+static int refresh_lists(void);
/* ERROR(...) macro for virterrors. */
-#define VIRT_ERROR(conn,s) do { \
- virErrorPtr err; \
- err = (conn) ? virConnGetLastError ((conn)) : virGetLastError (); \
- if (err) ERROR ("%s: %s", (s), err->message); \
- } while(0)
-
-static void
-init_value_list (value_list_t *vl, virDomainPtr dom)
-{
- int i, n;
- const char *name;
- char uuid[VIR_UUID_STRING_BUFLEN];
-
- sstrncpy (vl->plugin, PLUGIN_NAME, sizeof (vl->plugin));
-
- vl->host[0] = '\0';
-
- /* Construct the hostname field according to HostnameFormat. */
- for (i = 0; i < HF_MAX_FIELDS; ++i) {
- if (hostname_format[i] == hf_none)
- continue;
+#define VIRT_ERROR(conn, s) \
+ do { \
+ virErrorPtr err; \
+ err = (conn) ? virConnGetLastError((conn)) : virGetLastError(); \
+ if (err) \
+ ERROR("%s: %s", (s), err->message); \
+ } while (0)
- n = DATA_MAX_NAME_LEN - strlen (vl->host) - 2;
+static void init_value_list(value_list_t *vl, virDomainPtr dom) {
+ int n;
+ const char *name;
+ char uuid[VIR_UUID_STRING_BUFLEN];
- if (i > 0 && n >= 1) {
- strncat (vl->host, ":", 1);
- n--;
- }
+ sstrncpy(vl->plugin, PLUGIN_NAME, sizeof(vl->plugin));
- switch (hostname_format[i]) {
- case hf_none: break;
- case hf_hostname:
- strncat (vl->host, hostname_g, n);
- break;
- case hf_name:
- name = virDomainGetName (dom);
- if (name)
- strncat (vl->host, name, n);
- break;
- case hf_uuid:
- if (virDomainGetUUIDString (dom, uuid) == 0)
- strncat (vl->host, uuid, n);
- break;
- }
- }
+ vl->host[0] = '\0';
- vl->host[sizeof (vl->host) - 1] = '\0';
+ /* Construct the hostname field according to HostnameFormat. */
+ for (int i = 0; i < HF_MAX_FIELDS; ++i) {
+ if (hostname_format[i] == hf_none)
+ continue;
- /* Construct the plugin instance field according to PluginInstanceFormat. */
- for (i = 0; i < PLGINST_MAX_FIELDS; ++i) {
- if (plugin_instance_format[i] == plginst_none)
- continue;
+ n = DATA_MAX_NAME_LEN - strlen(vl->host) - 2;
- n = sizeof(vl->plugin_instance) - strlen (vl->plugin_instance) - 2;
-
- if (i > 0 && n >= 1) {
- strncat (vl->plugin_instance, ":", 1);
- n--;
- }
-
- switch (plugin_instance_format[i]) {
- case plginst_none: break;
- case plginst_name:
- name = virDomainGetName (dom);
- if (name)
- strncat (vl->plugin_instance, name, n);
- break;
- case plginst_uuid:
- if (virDomainGetUUIDString (dom, uuid) == 0)
- strncat (vl->plugin_instance, uuid, n);
- break;
- }
+ if (i > 0 && n >= 1) {
+ strncat(vl->host, ":", 1);
+ n--;
}
- vl->plugin_instance[sizeof (vl->plugin_instance) - 1] = '\0';
-
-} /* void init_value_list */
-
-static void
-memory_submit (gauge_t memory, virDomainPtr dom)
-{
- value_t values[1];
- value_list_t vl = VALUE_LIST_INIT;
-
- init_value_list (&vl, dom);
+ switch (hostname_format[i]) {
+ case hf_none:
+ break;
+ case hf_hostname:
+ strncat(vl->host, hostname_g, n);
+ break;
+ case hf_name:
+ name = virDomainGetName(dom);
+ if (name)
+ strncat(vl->host, name, n);
+ break;
+ case hf_uuid:
+ if (virDomainGetUUIDString(dom, uuid) == 0)
+ strncat(vl->host, uuid, n);
+ break;
+ }
+ }
- values[0].gauge = memory;
+ vl->host[sizeof(vl->host) - 1] = '\0';
- vl.values = values;
- vl.values_len = 1;
+ /* Construct the plugin instance field according to PluginInstanceFormat. */
+ for (int i = 0; i < PLGINST_MAX_FIELDS; ++i) {
+ if (plugin_instance_format[i] == plginst_none)
+ continue;
- sstrncpy (vl.type, "memory", sizeof (vl.type));
- sstrncpy (vl.type_instance, "total", sizeof (vl.type_instance));
+ n = sizeof(vl->plugin_instance) - strlen(vl->plugin_instance) - 2;
- plugin_dispatch_values (&vl);
-}
+ if (i > 0 && n >= 1) {
+ strncat(vl->plugin_instance, ":", 1);
+ n--;
+ }
-static void
-memory_stats_submit (gauge_t memory, virDomainPtr dom, int tag_index)
-{
- static const char *tags[] = { "swap_in", "swap_out", "major_fault", "minor_fault",
- "unused", "available", "actual_balloon", "rss"};
+ switch (plugin_instance_format[i]) {
+ case plginst_none:
+ break;
+ case plginst_name:
+ name = virDomainGetName(dom);
+ if (name)
+ strncat(vl->plugin_instance, name, n);
+ break;
+ case plginst_uuid:
+ if (virDomainGetUUIDString(dom, uuid) == 0)
+ strncat(vl->plugin_instance, uuid, n);
+ break;
+ }
+ }
- value_t values[1];
- value_list_t vl = VALUE_LIST_INIT;
+ vl->plugin_instance[sizeof(vl->plugin_instance) - 1] = '\0';
- init_value_list (&vl, dom);
+} /* void init_value_list */
- values[0].gauge = memory;
+static void submit(virDomainPtr dom, char const *type,
+ char const *type_instance, value_t *values,
+ size_t values_len) {
+ value_list_t vl = VALUE_LIST_INIT;
+ init_value_list(&vl, dom);
- vl.values = values;
- vl.values_len = 1;
+ vl.values = values;
+ vl.values_len = values_len;
- sstrncpy (vl.type, "memory", sizeof (vl.type));
- sstrncpy (vl.type_instance, tags[tag_index], sizeof (vl.type_instance));
+ sstrncpy(vl.type, type, sizeof(vl.type));
+ if (type_instance != NULL)
+ sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
- plugin_dispatch_values (&vl);
+ plugin_dispatch_values(&vl);
}
-static void
-cpu_submit (unsigned long long cpu_time,
- virDomainPtr dom, const char *type)
-{
- value_t values[1];
- value_list_t vl = VALUE_LIST_INIT;
-
- init_value_list (&vl, dom);
-
- values[0].derive = cpu_time;
-
- vl.values = values;
- vl.values_len = 1;
-
- sstrncpy (vl.type, type, sizeof (vl.type));
-
- plugin_dispatch_values (&vl);
+static void memory_submit(gauge_t value, virDomainPtr dom) {
+ submit(dom, "memory", "total", &(value_t){.gauge = value}, 1);
}
-static void
-vcpu_submit (derive_t cpu_time,
- virDomainPtr dom, int vcpu_nr, const char *type)
-{
- value_t values[1];
- value_list_t vl = VALUE_LIST_INIT;
+static void memory_stats_submit(gauge_t value, virDomainPtr dom,
+ int tag_index) {
+ static const char *tags[] = {"swap_in", "swap_out", "major_fault",
+ "minor_fault", "unused", "available",
+ "actual_balloon", "rss"};
- init_value_list (&vl, dom);
+ if ((tag_index < 0) || (tag_index >= STATIC_ARRAY_SIZE(tags))) {
+ ERROR("virt plugin: Array index out of bounds: tag_index = %d", tag_index);
+ return;
+ }
- values[0].derive = cpu_time;
- vl.values = values;
- vl.values_len = 1;
-
- sstrncpy (vl.type, type, sizeof (vl.type));
- ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%d", vcpu_nr);
+ submit(dom, "memory", tags[tag_index], &(value_t){.gauge = value}, 1);
+}
- plugin_dispatch_values (&vl);
+static void cpu_submit(unsigned long long value, virDomainPtr dom,
+ const char *type) {
+ submit(dom, type, NULL, &(value_t){.derive = (derive_t)value}, 1);
}
-static void
-submit_derive2 (const char *type, derive_t v0, derive_t v1,
- virDomainPtr dom, const char *devname)
-{
- value_t values[2];
- value_list_t vl = VALUE_LIST_INIT;
+static void vcpu_submit(derive_t value, virDomainPtr dom, int vcpu_nr,
+ const char *type) {
+ char type_instance[DATA_MAX_NAME_LEN];
- init_value_list (&vl, dom);
+ ssnprintf(type_instance, sizeof(type_instance), "%d", vcpu_nr);
- values[0].derive = v0;
- values[1].derive = v1;
- vl.values = values;
- vl.values_len = 2;
+ submit(dom, type, type_instance, &(value_t){.derive = value}, 1);
+}
- sstrncpy (vl.type, type, sizeof (vl.type));
- sstrncpy (vl.type_instance, devname, sizeof (vl.type_instance));
+static void submit_derive2(const char *type, derive_t v0, derive_t v1,
+ virDomainPtr dom, const char *devname) {
+ value_t values[] = {
+ {.derive = v0}, {.derive = v1},
+ };
- plugin_dispatch_values (&vl);
+ submit(dom, type, devname, values, STATIC_ARRAY_SIZE(values));
} /* void submit_derive2 */
-static int
-lv_init (void)
-{
- if (virInitialize () != 0)
- return -1;
- else
- return 0;
+static int lv_init(void) {
+ if (virInitialize() != 0)
+ return -1;
+ else
+ return 0;
}
-static int
-lv_config (const char *key, const char *value)
-{
- if (virInitialize () != 0)
- return 1;
-
- if (il_domains == NULL)
- il_domains = ignorelist_create (1);
- if (il_block_devices == NULL)
- il_block_devices = ignorelist_create (1);
- if (il_interface_devices == NULL)
- il_interface_devices = ignorelist_create (1);
-
- if (strcasecmp (key, "Connection") == 0) {
- char *tmp = strdup (value);
- if (tmp == NULL) {
- ERROR (PLUGIN_NAME " plugin: Connection strdup failed.");
- return 1;
- }
- sfree (conn_string);
- conn_string = tmp;
- return 0;
+static int lv_config(const char *key, const char *value) {
+ if (virInitialize() != 0)
+ return 1;
+
+ if (il_domains == NULL)
+ il_domains = ignorelist_create(1);
+ if (il_block_devices == NULL)
+ il_block_devices = ignorelist_create(1);
+ if (il_interface_devices == NULL)
+ il_interface_devices = ignorelist_create(1);
+
+ if (strcasecmp(key, "Connection") == 0) {
+ char *tmp = strdup(value);
+ if (tmp == NULL) {
+ ERROR(PLUGIN_NAME " plugin: Connection strdup failed.");
+ return 1;
}
+ sfree(conn_string);
+ conn_string = tmp;
+ return 0;
+ }
- if (strcasecmp (key, "RefreshInterval") == 0) {
- char *eptr = NULL;
- interval = strtol (value, &eptr, 10);
- if (eptr == NULL || *eptr != '\0') return 1;
- return 0;
- }
+ if (strcasecmp(key, "RefreshInterval") == 0) {
+ char *eptr = NULL;
+ interval = strtol(value, &eptr, 10);
+ if (eptr == NULL || *eptr != '\0')
+ return 1;
+ return 0;
+ }
- if (strcasecmp (key, "Domain") == 0) {
- if (ignorelist_add (il_domains, value)) return 1;
- return 0;
- }
- if (strcasecmp (key, "BlockDevice") == 0) {
- if (ignorelist_add (il_block_devices, value)) return 1;
- return 0;
- }
- if (strcasecmp (key, "InterfaceDevice") == 0) {
- if (ignorelist_add (il_interface_devices, value)) return 1;
- return 0;
+ if (strcasecmp(key, "Domain") == 0) {
+ if (ignorelist_add(il_domains, value))
+ return 1;
+ return 0;
+ }
+ if (strcasecmp(key, "BlockDevice") == 0) {
+ if (ignorelist_add(il_block_devices, value))
+ return 1;
+ return 0;
+ }
+
+ if (strcasecmp(key, "BlockDeviceFormat") == 0) {
+ if (strcasecmp(value, "target") == 0)
+ blockdevice_format = target;
+ else if (strcasecmp(value, "source") == 0)
+ blockdevice_format = source;
+ else {
+ ERROR(PLUGIN_NAME " plugin: unknown BlockDeviceFormat: %s", value);
+ return -1;
}
-
- if (strcasecmp (key, "IgnoreSelected") == 0) {
- if (IS_TRUE (value))
- {
- ignorelist_set_invert (il_domains, 0);
- ignorelist_set_invert (il_block_devices, 0);
- ignorelist_set_invert (il_interface_devices, 0);
- }
- else
- {
- ignorelist_set_invert (il_domains, 1);
- ignorelist_set_invert (il_block_devices, 1);
- ignorelist_set_invert (il_interface_devices, 1);
- }
- return 0;
+ return 0;
+ }
+ if (strcasecmp(key, "BlockDeviceFormatBasename") == 0) {
+ blockdevice_format_basename = IS_TRUE(value);
+ return 0;
+ }
+ if (strcasecmp(key, "InterfaceDevice") == 0) {
+ if (ignorelist_add(il_interface_devices, value))
+ return 1;
+ return 0;
+ }
+
+ if (strcasecmp(key, "IgnoreSelected") == 0) {
+ if (IS_TRUE(value)) {
+ ignorelist_set_invert(il_domains, 0);
+ ignorelist_set_invert(il_block_devices, 0);
+ ignorelist_set_invert(il_interface_devices, 0);
+ } else {
+ ignorelist_set_invert(il_domains, 1);
+ ignorelist_set_invert(il_block_devices, 1);
+ ignorelist_set_invert(il_interface_devices, 1);
}
+ return 0;
+ }
- if (strcasecmp (key, "HostnameFormat") == 0) {
- char *value_copy;
- char *fields[HF_MAX_FIELDS];
- int i, n;
-
- value_copy = strdup (value);
- if (value_copy == NULL) {
- ERROR (PLUGIN_NAME " plugin: strdup failed.");
- return -1;
- }
-
- n = strsplit (value_copy, fields, HF_MAX_FIELDS);
- if (n < 1) {
- sfree (value_copy);
- ERROR (PLUGIN_NAME " plugin: HostnameFormat: no fields");
- return -1;
- }
+ if (strcasecmp(key, "HostnameFormat") == 0) {
+ char *value_copy;
+ char *fields[HF_MAX_FIELDS];
+ int n;
- for (i = 0; i < n; ++i) {
- if (strcasecmp (fields[i], "hostname") == 0)
- hostname_format[i] = hf_hostname;
- else if (strcasecmp (fields[i], "name") == 0)
- hostname_format[i] = hf_name;
- else if (strcasecmp (fields[i], "uuid") == 0)
- hostname_format[i] = hf_uuid;
- else {
- ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
- sfree (value_copy);
- return -1;
- }
- }
- sfree (value_copy);
+ value_copy = strdup(value);
+ if (value_copy == NULL) {
+ ERROR(PLUGIN_NAME " plugin: strdup failed.");
+ return -1;
+ }
- for (i = n; i < HF_MAX_FIELDS; ++i)
- hostname_format[i] = hf_none;
+ n = strsplit(value_copy, fields, HF_MAX_FIELDS);
+ if (n < 1) {
+ sfree(value_copy);
+ ERROR(PLUGIN_NAME " plugin: HostnameFormat: no fields");
+ return -1;
+ }
- return 0;
+ for (int i = 0; i < n; ++i) {
+ if (strcasecmp(fields[i], "hostname") == 0)
+ hostname_format[i] = hf_hostname;
+ else if (strcasecmp(fields[i], "name") == 0)
+ hostname_format[i] = hf_name;
+ else if (strcasecmp(fields[i], "uuid") == 0)
+ hostname_format[i] = hf_uuid;
+ else {
+ ERROR(PLUGIN_NAME " plugin: unknown HostnameFormat field: %s",
+ fields[i]);
+ sfree(value_copy);
+ return -1;
+ }
}
+ sfree(value_copy);
- if (strcasecmp (key, "PluginInstanceFormat") == 0) {
- char *value_copy;
- char *fields[PLGINST_MAX_FIELDS];
- int i, n;
+ for (int i = n; i < HF_MAX_FIELDS; ++i)
+ hostname_format[i] = hf_none;
- value_copy = strdup (value);
- if (value_copy == NULL) {
- ERROR (PLUGIN_NAME " plugin: strdup failed.");
- return -1;
- }
+ return 0;
+ }
- n = strsplit (value_copy, fields, PLGINST_MAX_FIELDS);
- if (n < 1) {
- sfree (value_copy);
- ERROR (PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
- return -1;
- }
+ if (strcasecmp(key, "PluginInstanceFormat") == 0) {
+ char *value_copy;
+ char *fields[PLGINST_MAX_FIELDS];
+ int n;
- for (i = 0; i < n; ++i) {
- if (strcasecmp (fields[i], "none") == 0) {
- plugin_instance_format[i] = plginst_none;
- break;
- } else if (strcasecmp (fields[i], "name") == 0)
- plugin_instance_format[i] = plginst_name;
- else if (strcasecmp (fields[i], "uuid") == 0)
- plugin_instance_format[i] = plginst_uuid;
- else {
- ERROR (PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s", fields[i]);
- sfree (value_copy);
- return -1;
- }
- }
- sfree (value_copy);
+ value_copy = strdup(value);
+ if (value_copy == NULL) {
+ ERROR(PLUGIN_NAME " plugin: strdup failed.");
+ return -1;
+ }
- for (i = n; i < PLGINST_MAX_FIELDS; ++i)
- plugin_instance_format[i] = plginst_none;
+ n = strsplit(value_copy, fields, PLGINST_MAX_FIELDS);
+ if (n < 1) {
+ sfree(value_copy);
+ ERROR(PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
+ return -1;
+ }
- return 0;
+ for (int i = 0; i < n; ++i) {
+ if (strcasecmp(fields[i], "none") == 0) {
+ plugin_instance_format[i] = plginst_none;
+ break;
+ } else if (strcasecmp(fields[i], "name") == 0)
+ plugin_instance_format[i] = plginst_name;
+ else if (strcasecmp(fields[i], "uuid") == 0)
+ plugin_instance_format[i] = plginst_uuid;
+ else {
+ ERROR(PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s",
+ fields[i]);
+ sfree(value_copy);
+ return -1;
+ }
}
+ sfree(value_copy);
- if (strcasecmp (key, "InterfaceFormat") == 0) {
- if (strcasecmp (value, "name") == 0)
- 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 (PLUGIN_NAME " plugin: unknown InterfaceFormat: %s", value);
- return -1;
- }
- return 0;
+ for (int i = n; i < PLGINST_MAX_FIELDS; ++i)
+ plugin_instance_format[i] = plginst_none;
+
+ return 0;
+ }
+
+ if (strcasecmp(key, "InterfaceFormat") == 0) {
+ if (strcasecmp(value, "name") == 0)
+ 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(PLUGIN_NAME " plugin: unknown InterfaceFormat: %s", value);
+ return -1;
}
+ return 0;
+ }
- /* Unrecognised option. */
- return -1;
+ /* Unrecognised option. */
+ return -1;
}
-static int
-lv_read (void)
-{
- time_t t;
- int i;
+static int lv_read(void) {
+ time_t t;
+ if (conn == NULL) {
+ /* `conn_string == NULL' is acceptable. */
+ conn = virConnectOpenReadOnly(conn_string);
if (conn == NULL) {
- /* `conn_string == NULL' is acceptable. */
- conn = virConnectOpenReadOnly (conn_string);
- if (conn == NULL) {
- c_complain (LOG_ERR, &conn_complain,
- PLUGIN_NAME " plugin: Unable to connect: "
- "virConnectOpenReadOnly failed.");
- return -1;
- }
+ c_complain(LOG_ERR, &conn_complain,
+ PLUGIN_NAME " plugin: Unable to connect: "
+ "virConnectOpenReadOnly failed.");
+ return -1;
}
- c_release (LOG_NOTICE, &conn_complain,
+ }
+ c_release(LOG_NOTICE, &conn_complain,
PLUGIN_NAME " plugin: Connection established.");
- time (&t);
+ time(&t);
- /* Need to refresh domain or device lists? */
- if ((last_refresh == (time_t) 0) ||
- ((interval > 0) && ((last_refresh + interval) <= t))) {
- if (refresh_lists () != 0) {
- if (conn != NULL)
- virConnectClose (conn);
- conn = NULL;
- return -1;
- }
- last_refresh = t;
+ /* Need to refresh domain or device lists? */
+ if ((last_refresh == (time_t)0) ||
+ ((interval > 0) && ((last_refresh + interval) <= t))) {
+ if (refresh_lists() != 0) {
+ if (conn != NULL)
+ virConnectClose(conn);
+ conn = NULL;
+ return -1;
}
+ last_refresh = t;
+ }
#if 0
- for (i = 0; i < nr_domains; ++i)
+ for (int i = 0; i < nr_domains; ++i)
fprintf (stderr, "domain %s\n", virDomainGetName (domains[i]));
- for (i = 0; i < nr_block_devices; ++i)
+ for (int i = 0; i < nr_block_devices; ++i)
fprintf (stderr, "block device %d %s:%s\n",
i, virDomainGetName (block_devices[i].dom),
block_devices[i].path);
- for (i = 0; i < nr_interface_devices; ++i)
+ for (int i = 0; i < nr_interface_devices; ++i)
fprintf (stderr, "interface device %d %s:%s\n",
i, virDomainGetName (interface_devices[i].dom),
interface_devices[i].path);
#endif
- /* Get CPU usage, memory, VCPU usage for each domain. */
- for (i = 0; i < nr_domains; ++i) {
- virDomainInfo info;
- virVcpuInfoPtr vinfo = NULL;
- virDomainMemoryStatPtr minfo = NULL;
- int status;
- int j;
-
- status = virDomainGetInfo (domains[i], &info);
- if (status != 0)
- {
- ERROR (PLUGIN_NAME " plugin: virDomainGetInfo failed with status %i.",
- status);
- continue;
- }
-
- if (info.state != VIR_DOMAIN_RUNNING)
- {
- /* only gather stats for running domains */
- continue;
- }
-
- cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
- memory_submit ((gauge_t) info.memory * 1024, domains[i]);
+ /* Get CPU usage, memory, VCPU usage for each domain. */
+ for (int i = 0; i < nr_domains; ++i) {
+ virDomainInfo info;
+ virVcpuInfoPtr vinfo = NULL;
+ virDomainMemoryStatPtr minfo = NULL;
+ int status;
+
+ status = virDomainGetInfo(domains[i], &info);
+ if (status != 0) {
+ ERROR(PLUGIN_NAME " plugin: virDomainGetInfo failed with status %i.",
+ status);
+ continue;
+ }
- vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
- if (vinfo == NULL) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- continue;
- }
+ if (info.state != VIR_DOMAIN_RUNNING) {
+ /* only gather stats for running domains */
+ continue;
+ }
- status = virDomainGetVcpus (domains[i], vinfo, info.nrVirtCpu,
- /* cpu map = */ NULL, /* cpu map length = */ 0);
- if (status < 0)
- {
- ERROR (PLUGIN_NAME " plugin: virDomainGetVcpus failed with status %i.",
- status);
- sfree (vinfo);
- continue;
- }
+ cpu_submit(info.cpuTime, domains[i], "virt_cpu_total");
+ memory_submit((gauge_t)info.memory * 1024, domains[i]);
- for (j = 0; j < info.nrVirtCpu; ++j)
- vcpu_submit (vinfo[j].cpuTime,
- domains[i], vinfo[j].number, "virt_vcpu");
+ vinfo = malloc(info.nrVirtCpu * sizeof(vinfo[0]));
+ if (vinfo == NULL) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ continue;
+ }
- sfree (vinfo);
+ status = virDomainGetVcpus(domains[i], vinfo, info.nrVirtCpu,
+ /* cpu map = */ NULL, /* cpu map length = */ 0);
+ if (status < 0) {
+ ERROR(PLUGIN_NAME " plugin: virDomainGetVcpus failed with status %i.",
+ status);
+ sfree(vinfo);
+ continue;
+ }
- minfo = malloc (VIR_DOMAIN_MEMORY_STAT_NR * sizeof (virDomainMemoryStatStruct));
- if (minfo == NULL) {
- ERROR ("virt plugin: malloc failed.");
- continue;
- }
+ for (int j = 0; j < info.nrVirtCpu; ++j)
+ vcpu_submit(vinfo[j].cpuTime, domains[i], vinfo[j].number, "virt_vcpu");
- status = virDomainMemoryStats (domains[i], minfo, VIR_DOMAIN_MEMORY_STAT_NR, 0);
+ sfree(vinfo);
- if (status < 0) {
- ERROR ("virt plugin: virDomainMemoryStats failed with status %i.",
- status);
- sfree (minfo);
- continue;
- }
+ minfo =
+ malloc(VIR_DOMAIN_MEMORY_STAT_NR * sizeof(virDomainMemoryStatStruct));
+ if (minfo == NULL) {
+ ERROR("virt plugin: malloc failed.");
+ continue;
+ }
- for (j = 0; j < status; j++) {
- memory_stats_submit ((gauge_t) minfo[j].val * 1024, domains[i], minfo[j].tag);
- }
+ status =
+ virDomainMemoryStats(domains[i], minfo, VIR_DOMAIN_MEMORY_STAT_NR, 0);
- sfree (minfo);
+ if (status < 0) {
+ ERROR("virt plugin: virDomainMemoryStats failed with status %i.", status);
+ sfree(minfo);
+ continue;
}
+ for (int j = 0; j < status; j++) {
+ memory_stats_submit((gauge_t)minfo[j].val * 1024, domains[i],
+ minfo[j].tag);
+ }
- /* Get block device stats for each domain. */
- for (i = 0; i < nr_block_devices; ++i) {
- struct _virDomainBlockStats stats;
-
- if (virDomainBlockStats (block_devices[i].dom, block_devices[i].path,
- &stats, sizeof stats) != 0)
- continue;
+ sfree(minfo);
+ }
- if ((stats.rd_req != -1) && (stats.wr_req != -1))
- submit_derive2 ("disk_ops",
- (derive_t) stats.rd_req, (derive_t) stats.wr_req,
- block_devices[i].dom, block_devices[i].path);
-
- if ((stats.rd_bytes != -1) && (stats.wr_bytes != -1))
- submit_derive2 ("disk_octets",
- (derive_t) stats.rd_bytes, (derive_t) stats.wr_bytes,
- block_devices[i].dom, block_devices[i].path);
- } /* for (nr_block_devices) */
-
- /* Get interface stats for each domain. */
- for (i = 0; i < nr_interface_devices; ++i) {
- struct _virDomainInterfaceStats stats;
- 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;
- }
+ /* Get block device stats for each domain. */
+ for (int i = 0; i < nr_block_devices; ++i) {
+ struct _virDomainBlockStats stats;
- if (virDomainInterfaceStats (interface_devices[i].dom,
- interface_devices[i].path,
- &stats, sizeof stats) != 0)
- continue;
+ if (virDomainBlockStats(block_devices[i].dom, block_devices[i].path, &stats,
+ sizeof stats) != 0)
+ continue;
- if ((stats.rx_bytes != -1) && (stats.tx_bytes != -1))
- submit_derive2 ("if_octets",
- (derive_t) stats.rx_bytes, (derive_t) stats.tx_bytes,
- interface_devices[i].dom, display_name);
+ char *type_instance = NULL;
+ if (blockdevice_format_basename && blockdevice_format == source)
+ type_instance = strdup(basename(block_devices[i].path));
+ else
+ type_instance = strdup(block_devices[i].path);
+
+ if ((stats.rd_req != -1) && (stats.wr_req != -1))
+ submit_derive2("disk_ops", (derive_t)stats.rd_req, (derive_t)stats.wr_req,
+ block_devices[i].dom, type_instance);
+
+ if ((stats.rd_bytes != -1) && (stats.wr_bytes != -1))
+ submit_derive2("disk_octets", (derive_t)stats.rd_bytes,
+ (derive_t)stats.wr_bytes, block_devices[i].dom,
+ type_instance);
+
+ sfree(type_instance);
+ } /* for (nr_block_devices) */
+
+ /* Get interface stats for each domain. */
+ for (int i = 0; i < nr_interface_devices; ++i) {
+ struct _virDomainInterfaceStats stats;
+ 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 ((stats.rx_packets != -1) && (stats.tx_packets != -1))
- submit_derive2 ("if_packets",
- (derive_t) stats.rx_packets, (derive_t) stats.tx_packets,
- interface_devices[i].dom, display_name);
+ if (virDomainInterfaceStats(interface_devices[i].dom,
+ interface_devices[i].path, &stats,
+ sizeof stats) != 0)
+ continue;
+
+ if ((stats.rx_bytes != -1) && (stats.tx_bytes != -1))
+ submit_derive2("if_octets", (derive_t)stats.rx_bytes,
+ (derive_t)stats.tx_bytes, interface_devices[i].dom,
+ display_name);
+
+ if ((stats.rx_packets != -1) && (stats.tx_packets != -1))
+ submit_derive2("if_packets", (derive_t)stats.rx_packets,
+ (derive_t)stats.tx_packets, interface_devices[i].dom,
+ display_name);
+
+ if ((stats.rx_errs != -1) && (stats.tx_errs != -1))
+ submit_derive2("if_errors", (derive_t)stats.rx_errs,
+ (derive_t)stats.tx_errs, interface_devices[i].dom,
+ display_name);
+
+ if ((stats.rx_drop != -1) && (stats.tx_drop != -1))
+ submit_derive2("if_dropped", (derive_t)stats.rx_drop,
+ (derive_t)stats.tx_drop, interface_devices[i].dom,
+ display_name);
+ } /* for (nr_interface_devices) */
+
+ return 0;
+}
- if ((stats.rx_errs != -1) && (stats.tx_errs != -1))
- submit_derive2 ("if_errors",
- (derive_t) stats.rx_errs, (derive_t) stats.tx_errs,
- interface_devices[i].dom, display_name);
+static int refresh_lists(void) {
+ int n;
- if ((stats.rx_drop != -1) && (stats.tx_drop != -1))
- submit_derive2 ("if_dropped",
- (derive_t) stats.rx_drop, (derive_t) stats.tx_drop,
- interface_devices[i].dom, display_name);
- } /* for (nr_interface_devices) */
+ n = virConnectNumOfDomains(conn);
+ if (n < 0) {
+ VIRT_ERROR(conn, "reading number of domains");
+ return -1;
+ }
- return 0;
-}
+ if (n > 0) {
+ int *domids;
-static int
-refresh_lists (void)
-{
- int n;
+ /* Get list of domains. */
+ domids = malloc(sizeof(*domids) * n);
+ if (domids == NULL) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ return -1;
+ }
- n = virConnectNumOfDomains (conn);
+ n = virConnectListDomains(conn, domids, n);
if (n < 0) {
- VIRT_ERROR (conn, "reading number of domains");
- return -1;
+ VIRT_ERROR(conn, "reading list of domains");
+ sfree(domids);
+ return -1;
}
- if (n > 0) {
- int i;
- int *domids;
-
- /* Get list of domains. */
- domids = malloc (sizeof (*domids) * n);
- if (domids == NULL) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- return -1;
- }
-
- n = virConnectListDomains (conn, domids, n);
- if (n < 0) {
- VIRT_ERROR (conn, "reading list of domains");
- sfree (domids);
- return -1;
- }
+ free_block_devices();
+ free_interface_devices();
+ free_domains();
+
+ /* Fetch each domain and add it to the list, unless ignore. */
+ for (int i = 0; i < n; ++i) {
+ virDomainPtr dom = NULL;
+ const char *name;
+ char *xml = NULL;
+ xmlDocPtr xml_doc = NULL;
+ xmlXPathContextPtr xpath_ctx = NULL;
+ xmlXPathObjectPtr xpath_obj = NULL;
+
+ dom = virDomainLookupByID(conn, domids[i]);
+ if (dom == NULL) {
+ VIRT_ERROR(conn, "virDomainLookupByID");
+ /* Could be that the domain went away -- ignore it anyway. */
+ continue;
+ }
+
+ name = virDomainGetName(dom);
+ if (name == NULL) {
+ VIRT_ERROR(conn, "virDomainGetName");
+ goto cont;
+ }
+
+ if (il_domains && ignorelist_match(il_domains, name) != 0)
+ goto cont;
+
+ if (add_domain(dom) < 0) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ goto cont;
+ }
+
+ /* Get a list of devices for this domain. */
+ xml = virDomainGetXMLDesc(dom, 0);
+ if (!xml) {
+ VIRT_ERROR(conn, "virDomainGetXMLDesc");
+ goto cont;
+ }
+
+ /* Yuck, XML. Parse out the devices. */
+ xml_doc = xmlReadDoc((xmlChar *)xml, NULL, NULL, XML_PARSE_NONET);
+ if (xml_doc == NULL) {
+ VIRT_ERROR(conn, "xmlReadDoc");
+ goto cont;
+ }
+
+ xpath_ctx = xmlXPathNewContext(xml_doc);
+
+ /* Block devices. */
+ char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
+ if (blockdevice_format == source)
+ bd_xmlpath = "/domain/devices/disk/source[@dev]";
+ xpath_obj = xmlXPathEval((xmlChar *)bd_xmlpath, xpath_ctx);
+
+ if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
+ xpath_obj->nodesetval == NULL)
+ goto cont;
+
+ for (int j = 0; j < xpath_obj->nodesetval->nodeNr; ++j) {
+ xmlNodePtr node;
+ char *path = NULL;
+
+ node = xpath_obj->nodesetval->nodeTab[j];
+ if (!node)
+ continue;
+ path = (char *)xmlGetProp(node, (xmlChar *)"dev");
+ if (!path)
+ continue;
+
+ if (il_block_devices &&
+ ignore_device_match(il_block_devices, name, path) != 0)
+ goto cont2;
+
+ add_block_device(dom, path);
+ cont2:
+ if (path)
+ xmlFree(path);
+ }
+ xmlXPathFreeObject(xpath_obj);
+
+ /* Network interfaces. */
+ xpath_obj = xmlXPathEval(
+ (xmlChar *)"/domain/devices/interface[target[@dev]]", xpath_ctx);
+ if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
+ xpath_obj->nodesetval == NULL)
+ goto cont;
+
+ xmlNodeSetPtr xml_interfaces = xpath_obj->nodesetval;
+
+ for (int j = 0; j < xml_interfaces->nodeNr; ++j) {
+ char *path = NULL;
+ char *address = NULL;
+ xmlNodePtr xml_interface;
+
+ xml_interface = xml_interfaces->nodeTab[j];
+ if (!xml_interface)
+ continue;
+
+ for (xmlNodePtr child = xml_interface->children; child;
+ child = child->next) {
+ if (child->type != XML_ELEMENT_NODE)
+ continue;
- free_block_devices ();
- free_interface_devices ();
- free_domains ();
-
- /* Fetch each domain and add it to the list, unless ignore. */
- for (i = 0; i < n; ++i) {
- virDomainPtr dom = NULL;
- const char *name;
- char *xml = NULL;
- xmlDocPtr xml_doc = NULL;
- xmlXPathContextPtr xpath_ctx = NULL;
- xmlXPathObjectPtr xpath_obj = NULL;
- int j;
-
- dom = virDomainLookupByID (conn, domids[i]);
- if (dom == NULL) {
- VIRT_ERROR (conn, "virDomainLookupByID");
- /* Could be that the domain went away -- ignore it anyway. */
- continue;
- }
-
- name = virDomainGetName (dom);
- if (name == NULL) {
- VIRT_ERROR (conn, "virDomainGetName");
- goto cont;
- }
-
- if (il_domains && ignorelist_match (il_domains, name) != 0)
- goto cont;
-
- if (add_domain (dom) < 0) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- goto cont;
- }
-
- /* Get a list of devices for this domain. */
- xml = virDomainGetXMLDesc (dom, 0);
- if (!xml) {
- VIRT_ERROR (conn, "virDomainGetXMLDesc");
- goto cont;
- }
-
- /* Yuck, XML. Parse out the devices. */
- xml_doc = xmlReadDoc ((xmlChar *) xml, NULL, NULL, XML_PARSE_NONET);
- if (xml_doc == NULL) {
- VIRT_ERROR (conn, "xmlReadDoc");
- goto cont;
- }
-
- xpath_ctx = xmlXPathNewContext (xml_doc);
-
- /* Block devices. */
- xpath_obj = xmlXPathEval
- ((xmlChar *) "/domain/devices/disk/target[@dev]",
- xpath_ctx);
- if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
- xpath_obj->nodesetval == NULL)
- goto cont;
-
- for (j = 0; j < xpath_obj->nodesetval->nodeNr; ++j) {
- xmlNodePtr node;
- char *path = NULL;
-
- node = xpath_obj->nodesetval->nodeTab[j];
- if (!node) continue;
- path = (char *) xmlGetProp (node, (xmlChar *) "dev");
- if (!path) continue;
-
- if (il_block_devices &&
- ignore_device_match (il_block_devices, name, path) != 0)
- goto cont2;
-
- add_block_device (dom, path);
- cont2:
- if (path) xmlFree (path);
- }
- xmlXPathFreeObject (xpath_obj);
-
- /* Network interfaces. */
- xpath_obj = xmlXPathEval
- ((xmlChar *) "/domain/devices/interface[target[@dev]]",
- xpath_ctx);
- if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
- xpath_obj->nodesetval == NULL)
- goto cont;
-
- xmlNodeSetPtr xml_interfaces = xpath_obj->nodesetval;
-
- for (j = 0; j < xml_interfaces->nodeNr; ++j) {
- char *path = NULL;
- char *address = NULL;
- xmlNodePtr xml_interface;
-
- xml_interface = xml_interfaces->nodeTab[j];
- if (!xml_interface) continue;
- xmlNodePtr child = NULL;
-
- for (child = xml_interface->children; child; child = child->next) {
- if (child->type != XML_ELEMENT_NODE) continue;
-
- if (xmlStrEqual(child->name, (const xmlChar *) "target")) {
- path = (char *) xmlGetProp (child, (const xmlChar *) "dev");
- if (!path) continue;
- } else if (xmlStrEqual(child->name, (const xmlChar *) "mac")) {
- address = (char *) xmlGetProp (child, (const xmlChar *) "address");
- if (!address) continue;
- }
- }
-
- if (il_interface_devices &&
- (ignore_device_match (il_interface_devices, name, path) != 0 ||
- ignore_device_match (il_interface_devices, name, address) != 0))
- goto cont3;
-
- add_interface_device (dom, path, address, j+1);
- cont3:
- if (path) xmlFree (path);
- if (address) xmlFree (address);
- }
-
- cont:
- if (xpath_obj) xmlXPathFreeObject (xpath_obj);
- if (xpath_ctx) xmlXPathFreeContext (xpath_ctx);
- if (xml_doc) xmlFreeDoc (xml_doc);
- sfree (xml);
+ if (xmlStrEqual(child->name, (const xmlChar *)"target")) {
+ path = (char *)xmlGetProp(child, (const xmlChar *)"dev");
+ if (!path)
+ continue;
+ } else if (xmlStrEqual(child->name, (const xmlChar *)"mac")) {
+ address = (char *)xmlGetProp(child, (const xmlChar *)"address");
+ if (!address)
+ continue;
+ }
}
- sfree (domids);
+ if (il_interface_devices &&
+ (ignore_device_match(il_interface_devices, name, path) != 0 ||
+ ignore_device_match(il_interface_devices, name, address) != 0))
+ goto cont3;
+
+ add_interface_device(dom, path, address, j + 1);
+ cont3:
+ if (path)
+ xmlFree(path);
+ if (address)
+ xmlFree(address);
+ }
+
+ cont:
+ if (xpath_obj)
+ xmlXPathFreeObject(xpath_obj);
+ if (xpath_ctx)
+ xmlXPathFreeContext(xpath_ctx);
+ if (xml_doc)
+ xmlFreeDoc(xml_doc);
+ sfree(xml);
}
- return 0;
-}
+ sfree(domids);
+ }
-static void
-free_domains (void)
-{
- int i;
+ return 0;
+}
- if (domains) {
- for (i = 0; i < nr_domains; ++i)
- virDomainFree (domains[i]);
- sfree (domains);
- }
- domains = NULL;
- nr_domains = 0;
+static void free_domains(void) {
+ if (domains) {
+ for (int i = 0; i < nr_domains; ++i)
+ virDomainFree(domains[i]);
+ sfree(domains);
+ }
+ domains = NULL;
+ nr_domains = 0;
}
-static int
-add_domain (virDomainPtr dom)
-{
- virDomainPtr *new_ptr;
- int new_size = sizeof (domains[0]) * (nr_domains+1);
+static int add_domain(virDomainPtr dom) {
+ virDomainPtr *new_ptr;
+ int new_size = sizeof(domains[0]) * (nr_domains + 1);
- if (domains)
- new_ptr = realloc (domains, new_size);
- else
- new_ptr = malloc (new_size);
+ if (domains)
+ new_ptr = realloc(domains, new_size);
+ else
+ new_ptr = malloc(new_size);
- if (new_ptr == NULL)
- return -1;
+ if (new_ptr == NULL)
+ return -1;
- domains = new_ptr;
- domains[nr_domains] = dom;
- return nr_domains++;
+ domains = new_ptr;
+ domains[nr_domains] = dom;
+ return nr_domains++;
}
-static void
-free_block_devices (void)
-{
- int i;
-
- if (block_devices) {
- for (i = 0; i < nr_block_devices; ++i)
- sfree (block_devices[i].path);
- sfree (block_devices);
- }
- block_devices = NULL;
- nr_block_devices = 0;
+static void free_block_devices(void) {
+ if (block_devices) {
+ for (int i = 0; i < nr_block_devices; ++i)
+ sfree(block_devices[i].path);
+ sfree(block_devices);
+ }
+ block_devices = NULL;
+ nr_block_devices = 0;
}
-static int
-add_block_device (virDomainPtr dom, const char *path)
-{
- struct block_device *new_ptr;
- int new_size = sizeof (block_devices[0]) * (nr_block_devices+1);
- char *path_copy;
+static int add_block_device(virDomainPtr dom, const char *path) {
+ struct block_device *new_ptr;
+ int new_size = sizeof(block_devices[0]) * (nr_block_devices + 1);
+ char *path_copy;
- path_copy = strdup (path);
- if (!path_copy)
- return -1;
+ path_copy = strdup(path);
+ if (!path_copy)
+ return -1;
- if (block_devices)
- new_ptr = realloc (block_devices, new_size);
- else
- new_ptr = malloc (new_size);
+ if (block_devices)
+ new_ptr = realloc(block_devices, new_size);
+ else
+ new_ptr = malloc(new_size);
- if (new_ptr == NULL) {
- sfree (path_copy);
- return -1;
- }
- block_devices = new_ptr;
- block_devices[nr_block_devices].dom = dom;
- block_devices[nr_block_devices].path = path_copy;
- return nr_block_devices++;
+ if (new_ptr == NULL) {
+ sfree(path_copy);
+ return -1;
+ }
+ block_devices = new_ptr;
+ block_devices[nr_block_devices].dom = dom;
+ block_devices[nr_block_devices].path = path_copy;
+ return nr_block_devices++;
}
-static void
-free_interface_devices (void)
-{
- int i;
-
- if (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);
+static void free_interface_devices(void) {
+ if (interface_devices) {
+ for (int i = 0; i < nr_interface_devices; ++i) {
+ sfree(interface_devices[i].path);
+ sfree(interface_devices[i].address);
+ sfree(interface_devices[i].number);
}
- interface_devices = NULL;
- nr_interface_devices = 0;
+ sfree(interface_devices);
+ }
+ interface_devices = NULL;
+ nr_interface_devices = 0;
}
-static int
-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, number_string[15];
+static int 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, number_string[15];
- if ((path == NULL) || (address == NULL))
- return EINVAL;
+ if ((path == NULL) || (address == NULL))
+ return EINVAL;
- path_copy = strdup (path);
- if (!path_copy) return -1;
+ path_copy = strdup(path);
+ if (!path_copy)
+ return -1;
- address_copy = strdup (address);
- if (!address_copy) {
- sfree(path_copy);
- return -1;
- }
+ address_copy = strdup(address);
+ if (!address_copy) {
+ sfree(path_copy);
+ return -1;
+ }
- snprintf(number_string, sizeof (number_string), "interface-%u", number);
+ snprintf(number_string, sizeof(number_string), "interface-%u", number);
- if (interface_devices)
- new_ptr = realloc (interface_devices, new_size);
- else
- new_ptr = malloc (new_size);
+ if (interface_devices)
+ new_ptr = realloc(interface_devices, new_size);
+ else
+ new_ptr = malloc(new_size);
- if (new_ptr == NULL) {
- sfree (path_copy);
- sfree (address_copy);
- return -1;
- }
- interface_devices = new_ptr;
- 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++;
+ if (new_ptr == NULL) {
+ sfree(path_copy);
+ sfree(address_copy);
+ return -1;
+ }
+ interface_devices = new_ptr;
+ 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++;
}
-static int
-ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
-{
- char *name;
- int n, r;
+static int ignore_device_match(ignorelist_t *il, const char *domname,
+ const char *devpath) {
+ char *name;
+ int n, r;
- if ((domname == NULL) || (devpath == NULL))
- return 0;
+ if ((domname == NULL) || (devpath == NULL))
+ return 0;
- n = sizeof (char) * (strlen (domname) + strlen (devpath) + 2);
- name = malloc (n);
- if (name == NULL) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- return 0;
- }
- ssnprintf (name, n, "%s:%s", domname, devpath);
- r = ignorelist_match (il, name);
- sfree (name);
- return r;
+ n = sizeof(char) * (strlen(domname) + strlen(devpath) + 2);
+ name = malloc(n);
+ if (name == NULL) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ return 0;
+ }
+ ssnprintf(name, n, "%s:%s", domname, devpath);
+ r = ignorelist_match(il, name);
+ sfree(name);
+ return r;
}
-static int
-lv_shutdown (void)
-{
- free_block_devices ();
- free_interface_devices ();
- free_domains ();
+static int lv_shutdown(void) {
+ free_block_devices();
+ free_interface_devices();
+ free_domains();
- if (conn != NULL)
- virConnectClose (conn);
- conn = NULL;
+ if (conn != NULL)
+ virConnectClose(conn);
+ conn = NULL;
- ignorelist_free (il_domains);
- il_domains = NULL;
- ignorelist_free (il_block_devices);
- il_block_devices = NULL;
- ignorelist_free (il_interface_devices);
- il_interface_devices = NULL;
+ ignorelist_free(il_domains);
+ il_domains = NULL;
+ ignorelist_free(il_block_devices);
+ il_block_devices = NULL;
+ ignorelist_free(il_interface_devices);
+ il_interface_devices = NULL;
- return 0;
+ return 0;
}
-void
-module_register (void)
-{
- plugin_register_config (PLUGIN_NAME,
- lv_config,
- config_keys, NR_CONFIG_KEYS);
- plugin_register_init (PLUGIN_NAME, lv_init);
- plugin_register_read (PLUGIN_NAME, lv_read);
- plugin_register_shutdown (PLUGIN_NAME, lv_shutdown);
+void module_register(void) {
+ plugin_register_config(PLUGIN_NAME, lv_config, config_keys, NR_CONFIG_KEYS);
+ plugin_register_init(PLUGIN_NAME, lv_init);
+ plugin_register_read(PLUGIN_NAME, lv_read);
+ plugin_register_shutdown(PLUGIN_NAME, lv_shutdown);
}
/*
projects / collectd.git / blobdiff