Merge branch 'collectd-5.4'

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
Simple merge

diff --cc src/collectd.conf.in
index dcb1a7a0725d8fbfaeaba0a04cbcbd017677681e,5088eaeaabe9847b82cb3b1c74cf40b2c2fdb382..95734c266bb89af3dd4d4605cd6519fe40cad0cd
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -733,9 -676,8 +733,9 @@@
  #             Username "user"
  #             Password "secret"
  #             Interface "eth0"
 +#             ResolveInterval 14400
  @LOAD_PLUGIN_NETWORK@ </Server>
- #     TimeToLive "128"
+ #     TimeToLive 128
  #
  #     # server setup:
  #     Listen "ff18::efc0:4a42" "25826"

diff --cc src/cpu.c
Simple merge

diff --cc src/daemon/types_list.c
index b3cb8cf8e7592ca862da720bba8513695190677d,0000000000000000000000000000000000000000..c0e61c54b0e9e52168c85b31c9cd7bd9b422efde
mode 100644,000000..100644
--- 1/src/daemon/types_list.c
--- /dev/null
+++ b/src/daemon/types_list.c
@@@ -1,207 -1,0 +1,207 @@@
-         || (buf[buf_len - 1] == '\n')))
 +/**
 + * collectd - src/types_list.c
 + * Copyright (C) 2007       Florian octo Forster
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining a
 + * copy of this software and associated documentation files (the "Software"),
 + * to deal in the Software without restriction, including without limitation
 + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 + * and/or sell copies of the Software, and to permit persons to whom the
 + * Software is furnished to do so, subject to the following conditions:
 + *
 + * The above copyright notice and this permission notice shall be included in
 + * all copies or substantial portions of the Software.
 + *
 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 + * DEALINGS IN THE SOFTWARE.
 + *
 + * Authors:
 + *   Florian octo Forster <octo at collectd.org>
 + **/
 +
 +#include "collectd.h"
 +#include "common.h"
 +
 +#include "plugin.h"
 +#include "configfile.h"
 +
 +static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
 +{
 +  char *dummy;
 +  char *saveptr;
 +  char *fields[8];
 +  int   fields_num;
 +
 +  if (buf_len < 11)
 +  {
 +    ERROR ("parse_ds: (buf_len = %zu) < 11", buf_len);
 +    return (-1);
 +  }
 +
 +  if (buf[buf_len - 1] == ',')
 +  {
 +    buf_len--;
 +    buf[buf_len] = '\0';
 +  }
 +
 +  dummy = buf;
 +  saveptr = NULL;
 +
 +  fields_num = 0;
 +  while (fields_num < 8)
 +  {
 +    if ((fields[fields_num] = strtok_r (dummy, ":", &saveptr)) == NULL)
 +      break;
 +    dummy = NULL;
 +    fields_num++;
 +  }
 +
 +  if (fields_num != 4)
 +  {
 +    ERROR ("parse_ds: (fields_num = %i) != 4", fields_num);
 +    return (-1);
 +  }
 +
 +  sstrncpy (dsrc->name, fields[0], sizeof (dsrc->name));
 +
 +  if (strcasecmp (fields[1], "GAUGE") == 0)
 +    dsrc->type = DS_TYPE_GAUGE;
 +  else if (strcasecmp (fields[1], "COUNTER") == 0)
 +    dsrc->type = DS_TYPE_COUNTER;
 +  else if (strcasecmp (fields[1], "DERIVE") == 0)
 +    dsrc->type = DS_TYPE_DERIVE;
 +  else if (strcasecmp (fields[1], "ABSOLUTE") == 0)
 +    dsrc->type = DS_TYPE_ABSOLUTE;
 +  else
 +  {
 +    ERROR ("(fields[1] = %s) != (GAUGE || COUNTER || DERIVE || ABSOLUTE)", fields[1]);
 +    return (-1);
 +  }
 +
 +  if (strcasecmp (fields[2], "U") == 0)
 +    dsrc->min = NAN;
 +  else
 +    dsrc->min = atof (fields[2]);
 +
 +  if (strcasecmp (fields[3], "U") == 0)
 +    dsrc->max = NAN;
 +  else
 +    dsrc->max = atof (fields[3]);
 +
 +  return (0);
 +} /* int parse_ds */
 +
 +static void parse_line (char *buf)
 +{
 +  char  *fields[64];
 +  size_t fields_num;
 +  data_set_t *ds;
 +  int i;
 +
 +  fields_num = strsplit (buf, fields, 64);
 +  if (fields_num < 2)
 +    return;
 +
 +  /* Ignore lines which begin with a hash sign. */
 +  if (fields[0][0] == '#')
 +    return;
 +
 +  ds = (data_set_t *) malloc (sizeof (data_set_t));
 +  if (ds == NULL)
 +    return;
 +
 +  memset (ds, '\0', sizeof (data_set_t));
 +
 +  sstrncpy (ds->type, fields[0], sizeof (ds->type));
 +
 +  ds->ds_num = fields_num - 1;
 +  ds->ds = (data_source_t *) calloc (ds->ds_num, sizeof (data_source_t));
 +  if (ds->ds == NULL)
 +    return;
 +
 +  for (i = 0; i < ds->ds_num; i++)
 +    if (parse_ds (ds->ds + i, fields[i + 1], strlen (fields[i + 1])) != 0)
 +    {
 +      sfree (ds->ds);
 +      ERROR ("types_list: parse_line: Cannot parse data source #%i "
 +        "of data set %s", i, ds->type);
 +      return;
 +    }
 +
 +  plugin_register_data_set (ds);
 +
 +  sfree (ds->ds);
 +  sfree (ds);
 +} /* void parse_line */
 +
 +static void parse_file (FILE *fh)
 +{
 +  char buf[4096];
 +  size_t buf_len;
 +
 +  while (fgets (buf, sizeof (buf), fh) != NULL)
 +  {
 +    buf_len = strlen (buf);
 +
 +    if (buf_len >= 4095)
 +    {
 +      NOTICE ("Skipping line with more than 4095 characters.");
 +      do
 +      {
 +      if (fgets (buf, sizeof (buf), fh) == NULL)
 +        break;
 +      buf_len = strlen (buf);
 +      } while (buf_len >= 4095);
 +      continue;
 +    } /* if (buf_len >= 4095) */
 +
 +    if ((buf_len == 0) || (buf[0] == '#'))
 +      continue;
 +
 +    while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
++        || (buf[buf_len - 1] == '\r')))
 +      buf[--buf_len] = '\0';
 +
 +    if (buf_len == 0)
 +      continue;
 +
 +    parse_line (buf);
 +  } /* while (fgets) */
 +} /* void parse_file */
 +
 +int read_types_list (const char *file)
 +{
 +  FILE *fh;
 +
 +  if (file == NULL)
 +    return (-1);
 +
 +  fh = fopen (file, "r");
 +  if (fh == NULL)
 +  {
 +    char errbuf[1024];
 +    fprintf (stderr, "Failed to open types database `%s': %s.\n",
 +      file, sstrerror (errno, errbuf, sizeof (errbuf)));
 +    ERROR ("Failed to open types database `%s': %s",
 +      file, sstrerror (errno, errbuf, sizeof (errbuf)));
 +    return (-1);
 +  }
 +
 +  parse_file (fh);
 +
 +  fclose (fh);
 +  fh = NULL;
 +
 +  DEBUG ("Done parsing `%s'", file);
 +
 +  return (0);
 +} /* int read_types_list */
 +
 +/*
 + * vim: shiftwidth=2:softtabstop=2:tabstop=8
 + */

diff --cc src/libcollectdclient/client.c
Simple merge

diff --cc src/netlink.c
Simple merge

diff --cc src/utils_cmd_flush.c
Simple merge

diff --cc src/utils_cmd_getval.c
Simple merge

diff --cc src/utils_cmd_listval.c
Simple merge

diff --cc src/utils_cmd_putnotif.c
Simple merge

diff --cc src/utils_cmd_putval.c
Simple merge

diff --cc src/virt.c
index 5f87625ab5f758334330bfd388d38abc7fb3ccfc,0000000000000000000000000000000000000000..b6fedf55efae12f6f7921d2cd29d6c918263fd97
mode 100644,000000..100644
--- 1/src/virt.c
--- /dev/null
+++ b/src/virt.c
@@@ -1,1004 -1,0 +1,1010 @@@
 +/**
 + * collectd - src/virt.c
 + * Copyright (C) 2006-2008  Red Hat Inc.
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of the GNU General Public License as published by the
 + * Free Software Foundation; only version 2 of the license is applicable.
 + *
 + * This program is distributed in the hope that it will be useful, but
 + * WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License along
 + * with this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 + *
 + * Authors:
 + *   Richard W.M. Jones <rjones@redhat.com>
 + **/
 +
 +#include "collectd.h"
 +#include "common.h"
 +#include "plugin.h"
 +#include "configfile.h"
 +#include "utils_ignorelist.h"
 +#include "utils_complain.h"
 +
 +#include <libvirt/libvirt.h>
 +#include <libvirt/virterror.h>
 +#include <libxml/parser.h>
 +#include <libxml/tree.h>
 +#include <libxml/xpath.h>
 +
 +/* Plugin name */
 +#define PLUGIN_NAME "virt"
 +
 +static const char *config_keys[] = {
 +    "Connection",
 +
 +    "RefreshInterval",
 +
 +    "Domain",
 +    "BlockDevice",
 +    "InterfaceDevice",
 +    "IgnoreSelected",
 +
 +    "HostnameFormat",
 +    "InterfaceFormat",
 +
 +    "PluginInstanceFormat",
 +
 +    NULL
 +};
 +#define NR_CONFIG_KEYS ((sizeof config_keys / sizeof config_keys[0]) - 1)
 +
 +/* Connection. */
 +static virConnectPtr conn = 0;
 +static char *conn_string = NULL;
 +static c_complain_t conn_complain = C_COMPLAIN_INIT_STATIC;
 +
 +/* Seconds between list refreshes, 0 disables completely. */
 +static int interval = 60;
 +
 +/* List of domains, if specified. */
 +static ignorelist_t *il_domains = NULL;
 +/* List of block devices, if specified. */
 +static ignorelist_t *il_block_devices = NULL;
 +/* 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);
 +
 +/* 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);
 +
 +/* Actual list of block devices found on last refresh. */
 +struct 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);
 +
 +/* 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 */
 +};
 +
 +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);
 +
 +/* HostnameFormat. */
 +#define HF_MAX_FIELDS 3
 +
 +enum hf_field {
 +    hf_none = 0,
 +    hf_hostname,
 +    hf_name,
 +    hf_uuid
 +};
 +
 +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
 +};
 +
 +static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] =
 +    { plginst_name };
 +
 +/* InterfaceFormat. */
 +enum if_field {
 +    if_address,
 +    if_name,
 +    if_number
 +};
 +
 +static enum if_field interface_format = if_name;
 +
 +/* Time that we last refreshed. */
 +static time_t last_refresh = (time_t) 0;
 +
 +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;
 +
 +        n = DATA_MAX_NAME_LEN - strlen (vl->host) - 2;
 +
 +        if (i > 0 && n >= 1) {
 +            strncat (vl->host, ":", 1);
 +            n--;
 +        }
 +
 +        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[sizeof (vl->host) - 1] = '\0';
 +
 +    /* 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 = 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;
 +        }
 +    }
 +
 +    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);
 +
 +    values[0].gauge = memory;
 +
 +    vl.values = values;
 +    vl.values_len = 1;
 +
 +    sstrncpy (vl.type, "memory", sizeof (vl.type));
 +    sstrncpy (vl.type_instance, "total", sizeof (vl.type_instance));
 +
 +    plugin_dispatch_values (&vl);
 +}
 +
 +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"};
 +
 +    value_t values[1];
 +    value_list_t vl = VALUE_LIST_INIT;
 +
 +    init_value_list (&vl, dom);
 +
 +    values[0].gauge = memory;
 +
 +    vl.values = values;
 +    vl.values_len = 1;
 +
 +    sstrncpy (vl.type, "memory", sizeof (vl.type));
 +    sstrncpy (vl.type_instance, tags[tag_index], sizeof (vl.type_instance));
 +
 +    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
 +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;
 +
 +    init_value_list (&vl, dom);
 +
 +    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);
 +
 +    plugin_dispatch_values (&vl);
 +}
 +
 +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;
 +
 +    init_value_list (&vl, dom);
 +
 +    values[0].derive = v0;
 +    values[1].derive = v1;
 +    vl.values = values;
 +    vl.values_len = 2;
 +
 +    sstrncpy (vl.type, type, sizeof (vl.type));
 +    sstrncpy (vl.type_instance, devname, sizeof (vl.type_instance));
 +
 +    plugin_dispatch_values (&vl);
 +} /* void submit_derive2 */
 +
 +static int
 +lv_init (void)
 +{
 +    if (virInitialize () != 0)
 +        return -1;
 +
 +      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, "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, "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;
 +        }
 +
 +        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 {
 +                sfree (value_copy);
 +                ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
 +                return -1;
 +            }
 +        }
 +        sfree (value_copy);
 +
 +        for (i = n; i < HF_MAX_FIELDS; ++i)
 +            hostname_format[i] = hf_none;
 +
 +        return 0;
 +    }
 +
 +    if (strcasecmp (key, "PluginInstanceFormat") == 0) {
 +        char *value_copy;
 +        char *fields[PLGINST_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, PLGINST_MAX_FIELDS);
 +        if (n < 1) {
 +            sfree (value_copy);
 +            ERROR (PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
 +            return -1;
 +        }
 +
 +        for (i = 0; i < n; ++i) {
 +            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 {
 +                sfree (value_copy);
 +                ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
 +                return -1;
 +            }
 +        }
 +        sfree (value_copy);
 +
 +        for (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;
 +}
 +
 +static int
 +lv_read (void)
 +{
 +    time_t t;
 +    int i;
 +
 +    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_release (LOG_NOTICE, &conn_complain,
 +            PLUGIN_NAME " plugin: Connection established.");
 +
 +    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;
 +    }
 +
 +#if 0
 +    for (i = 0; i < nr_domains; ++i)
 +        fprintf (stderr, "domain %s\n", virDomainGetName (domains[i]));
 +    for (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)
 +        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]);
 +
 +        vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
 +        if (vinfo == NULL) {
 +            ERROR (PLUGIN_NAME " plugin: malloc failed.");
 +            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;
 +        }
 +
 +        for (j = 0; j < info.nrVirtCpu; ++j)
 +            vcpu_submit (vinfo[j].cpuTime,
 +                    domains[i], vinfo[j].number, "virt_vcpu");
 +
 +        sfree (vinfo);
 +
 +        minfo = malloc (VIR_DOMAIN_MEMORY_STAT_NR * sizeof (virDomainMemoryStatStruct));
 +        if (minfo == NULL) {
 +            ERROR ("virt plugin: malloc failed.");
 +            continue;
 +        }
 +
 +        status =  virDomainMemoryStats (domains[i], minfo, VIR_DOMAIN_MEMORY_STAT_NR, 0);
 +
 +        if (status < 0) {
 +            ERROR ("virt plugin: virDomainMemoryStats failed with status %i.",
 +                    status);
 +            sfree (minfo);
 +            continue;
 +        }
 +
 +        for (j = 0; j < status; j++) {
 +            memory_stats_submit ((gauge_t) minfo[j].val * 1024, domains[i], minfo[j].tag);
 +        }
 +
 +        sfree (minfo);
 +    }
 +
 +
 +    /* 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;
 +
 +        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;
 +        }
 +
 +        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;
 +}
 +
 +static int
 +refresh_lists (void)
 +{
 +    int n;
 +
 +    n = virConnectNumOfDomains (conn);
 +    if (n < 0) {
 +        VIRT_ERROR (conn, "reading number of domains");
 +        return -1;
 +    }
 +
 +    if (n > 0) {
 +        int i;
 +        int *domids;
 +
 +        /* Get list of domains. */
 +        domids = malloc (sizeof (int) * n);
 +        if (domids == 0) {
 +            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 (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);
 +        }
 +
 +        sfree (domids);
 +    }
 +
 +    return 0;
 +}
 +
 +static void
 +free_domains ()
 +{
 +    int i;
 +
 +    if (domains) {
 +        for (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);
 +
 +    if (domains)
 +        new_ptr = realloc (domains, new_size);
 +    else
 +        new_ptr = malloc (new_size);
 +
 +    if (new_ptr == NULL)
 +        return -1;
 +
 +    domains = new_ptr;
 +    domains[nr_domains] = dom;
 +    return nr_domains++;
 +}
 +
 +static void
 +free_block_devices ()
 +{
 +    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 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;
 +
 +    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++;
 +}
 +
 +static void
 +free_interface_devices ()
 +{
 +    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);
 +    }
 +    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];
 +
 +    path_copy = strdup (path);
 +    if (!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);
 +
 +    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++;
 +}
 +
 +static int
 +ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
 +{
 +    char *name;
 +    int n, 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 ();
 +
 +    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;
 +
 +    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);
 +}
 +
 +/*
 + * vim: shiftwidth=4 tabstop=8 softtabstop=4 expandtab fdm=marker
 + */