From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 9 May 2015 22:14:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~29
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b57d6e25aa792f0461aee4e5bd6d1838c478af50;p=collectd.git

Merge branch 'collectd-5.4'
---

b57d6e25aa792f0461aee4e5bd6d1838c478af50
diff --cc contrib/redhat/collectd.spec
index e023a341,d3f26749..20f6dd5f
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -204,14 -185,16 +204,14 @@@
  %define with_tape 0%{!?_without_tape:0}
  # plugin tokyotyrant disabled, requires tcrdb.h
  %define with_tokyotyrant 0%{!?_without_tokyotyrant:0}
 +# plugin write_kafka disabled, requires librdkafka
 +%define with_write_kafka 0%{!?_without_write_kafka:0}
  # plugin write_mongodb disabled, requires libmongoc
  %define with_write_mongodb 0%{!?_without_write_mongodb:0}
 -# plugin write_redis disabled, requires credis
 -%define with_write_redis 0%{!?_without_write_redis:0}
  # plugin xmms disabled, requires xmms
  %define with_xmms 0%{!?_without_xmms:0}
 -# plugin zfs_arc disabled, requires FreeBSD/Solaris
 -%define with_zfs_arc 0%{!?_without_zfs_arc:0}
  
- Summary:	Statistics collection daemon for filling RRD files
+ Summary:	statistics collection and monitoring daemon
  Name:		collectd
  Version:	5.4.2
  Release:	1%{?dist}
diff --cc src/daemon/meta_data.c
index d3da9bb5,00000000..6ee8446b
mode 100644,000000..100644
--- a/src/daemon/meta_data.c
+++ b/src/daemon/meta_data.c
@@@ -1,637 -1,0 +1,637 @@@
 +/**
 + * collectd - src/meta_data.c
 + * Copyright (C) 2008-2011  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 "plugin.h"
 +#include "meta_data.h"
 +
 +#include <pthread.h>
 +
 +/*
 + * Data types
 + */
 +union meta_value_u
 +{
 +  char    *mv_string;
 +  int64_t  mv_signed_int;
 +  uint64_t mv_unsigned_int;
 +  double   mv_double;
 +  _Bool    mv_boolean;
 +};
 +typedef union meta_value_u meta_value_t;
 +
 +struct meta_entry_s;
 +typedef struct meta_entry_s meta_entry_t;
 +struct meta_entry_s
 +{
 +  char         *key;
 +  meta_value_t  value;
 +  int           type;
 +  meta_entry_t *next;
 +};
 +
 +struct meta_data_s
 +{
 +  meta_entry_t   *head;
 +  pthread_mutex_t lock;
 +};
 +
 +/*
 + * Private functions
 + */
 +static char *md_strdup (const char *orig) /* {{{ */
 +{
 +  size_t sz;
 +  char *dest;
 +
 +  if (orig == NULL)
 +    return (NULL);
 +
 +  sz = strlen (orig) + 1;
 +  dest = (char *) malloc (sz);
 +  if (dest == NULL)
 +    return (NULL);
 +
 +  memcpy (dest, orig, sz);
 +
 +  return (dest);
 +} /* }}} char *md_strdup */
 +
 +static meta_entry_t *md_entry_alloc (const char *key) /* {{{ */
 +{
 +  meta_entry_t *e;
 +
 +  e = (meta_entry_t *) malloc (sizeof (*e));
 +  if (e == NULL)
 +  {
 +    ERROR ("md_entry_alloc: malloc failed.");
 +    return (NULL);
 +  }
 +  memset (e, 0, sizeof (*e));
 +
 +  e->key = md_strdup (key);
 +  if (e->key == NULL)
 +  {
 +    free (e);
 +    ERROR ("md_entry_alloc: md_strdup failed.");
 +    return (NULL);
 +  }
 +
 +  e->type = 0;
 +  e->next = NULL;
 +
 +  return (e);
 +} /* }}} meta_entry_t *md_entry_alloc */
 +
 +static meta_entry_t *md_entry_clone (const meta_entry_t *orig) /* {{{ */
 +{
 +  meta_entry_t *copy;
 +
 +  if (orig == NULL)
 +    return (NULL);
 +
 +  copy = md_entry_alloc (orig->key);
 +  copy->type = orig->type;
 +  if (copy->type == MD_TYPE_STRING)
 +    copy->value.mv_string = strdup (orig->value.mv_string);
 +  else
 +    copy->value = orig->value;
 +
 +  copy->next = md_entry_clone (orig->next);
 +  return (copy);
 +} /* }}} meta_entry_t *md_entry_clone */
 +
 +static void md_entry_free (meta_entry_t *e) /* {{{ */
 +{
 +  if (e == NULL)
 +    return;
 +
 +  free (e->key);
 +
 +  if (e->type == MD_TYPE_STRING)
 +    free (e->value.mv_string);
 +
 +  if (e->next != NULL)
 +    md_entry_free (e->next);
 +
 +  free (e);
 +} /* }}} void md_entry_free */
 +
 +static int md_entry_insert (meta_data_t *md, meta_entry_t *e) /* {{{ */
 +{
 +  meta_entry_t *this;
 +  meta_entry_t *prev;
 +
 +  if ((md == NULL) || (e == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  prev = NULL;
 +  this = md->head;
 +  while (this != NULL)
 +  {
 +    if (strcasecmp (e->key, this->key) == 0)
 +      break;
 +
 +    prev = this;
 +    this = this->next;
 +  }
 +
 +  if (this == NULL)
 +  {
 +    /* This key does not exist yet. */
 +    if (md->head == NULL)
 +      md->head = e;
 +    else
 +    {
 +      assert (prev != NULL);
 +      prev->next = e;
 +    }
 +
 +    e->next = NULL;
 +  }
 +  else /* (this != NULL) */
 +  {
 +    if (prev == NULL)
 +      md->head = e;
 +    else
 +      prev->next = e;
 +
 +    e->next = this->next;
 +  }
 +
 +  pthread_mutex_unlock (&md->lock);
 +
 +  if (this != NULL)
 +  {
 +    this->next = NULL;
 +    md_entry_free (this);
 +  }
 +
 +  return (0);
 +} /* }}} int md_entry_insert */
 +
 +/* XXX: The lock on md must be held while calling this function! */
 +static meta_entry_t *md_entry_lookup (meta_data_t *md, /* {{{ */
 +    const char *key)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (NULL);
 +
 +  for (e = md->head; e != NULL; e = e->next)
 +    if (strcasecmp (key, e->key) == 0)
 +      break;
 +
 +  return (e);
 +} /* }}} meta_entry_t *md_entry_lookup */
 +
 +/*
 + * Public functions
 + */
 +meta_data_t *meta_data_create (void) /* {{{ */
 +{
 +  meta_data_t *md;
 +
 +  md = (meta_data_t *) malloc (sizeof (*md));
 +  if (md == NULL)
 +  {
 +    ERROR ("meta_data_create: malloc failed.");
 +    return (NULL);
 +  }
 +  memset (md, 0, sizeof (*md));
 +
 +  md->head = NULL;
 +  pthread_mutex_init (&md->lock, /* attr = */ NULL);
 +
 +  return (md);
 +} /* }}} meta_data_t *meta_data_create */
 +
 +meta_data_t *meta_data_clone (meta_data_t *orig) /* {{{ */
 +{
 +  meta_data_t *copy;
 +
 +  if (orig == NULL)
 +    return (NULL);
 +
 +  copy = meta_data_create ();
 +  if (copy == NULL)
 +    return (NULL);
 +
 +  pthread_mutex_lock (&orig->lock);
 +  copy->head = md_entry_clone (orig->head);
 +  pthread_mutex_unlock (&orig->lock);
 +
 +  return (copy);
 +} /* }}} meta_data_t *meta_data_clone */
 +
 +void meta_data_destroy (meta_data_t *md) /* {{{ */
 +{
 +  if (md == NULL)
 +    return;
 +
 +  pthread_mutex_destroy(&md->lock);
 +  md_entry_free (md->head);
 +  pthread_mutex_destroy (&md->lock);
 +  free (md);
 +} /* }}} void meta_data_destroy */
 +
 +int meta_data_exists (meta_data_t *md, const char *key) /* {{{ */
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  for (e = md->head; e != NULL; e = e->next)
 +  {
 +    if (strcasecmp (key, e->key) == 0)
 +    {
 +      pthread_mutex_unlock (&md->lock);
 +      return (1);
 +    }
 +  }
 +
 +  pthread_mutex_unlock (&md->lock);
 +  return (0);
 +} /* }}} int meta_data_exists */
 +
 +int meta_data_type (meta_data_t *md, const char *key) /* {{{ */
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return -EINVAL;
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  for (e = md->head; e != NULL; e = e->next)
 +  {
 +    if (strcasecmp (key, e->key) == 0)
 +    {
 +      pthread_mutex_unlock (&md->lock);
 +      return e->type;
 +    }
 +  }
 +
 +  pthread_mutex_unlock (&md->lock);
 +  return 0;
 +} /* }}} int meta_data_type */
 +
 +int meta_data_toc (meta_data_t *md, char ***toc) /* {{{ */
 +{
 +  int i = 0, count = 0;
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (toc == NULL))
 +    return -EINVAL;
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  for (e = md->head; e != NULL; e = e->next)
 +    ++count;    
 +
 +  if (count == 0)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (count);
 +  }
 +
 +  *toc = calloc(count, sizeof(**toc));
 +  for (e = md->head; e != NULL; e = e->next)
 +    (*toc)[i++] = strdup(e->key);
 +  
 +  pthread_mutex_unlock (&md->lock);
 +  return count;
 +} /* }}} int meta_data_toc */
 +
 +int meta_data_delete (meta_data_t *md, const char *key) /* {{{ */
 +{
 +  meta_entry_t *this;
 +  meta_entry_t *prev;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  prev = NULL;
 +  this = md->head;
 +  while (this != NULL)
 +  {
 +    if (strcasecmp (key, this->key) == 0)
 +      break;
 +
 +    prev = this;
 +    this = this->next;
 +  }
 +
 +  if (this == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  if (prev == NULL)
 +    md->head = this->next;
 +  else
 +    prev->next = this->next;
 +
 +  pthread_mutex_unlock (&md->lock);
 +
 +  this->next = NULL;
 +  md_entry_free (this);
 +
 +  return (0);
 +} /* }}} int meta_data_delete */
 +
 +/*
 + * Add functions
 + */
 +int meta_data_add_string (meta_data_t *md, /* {{{ */
 +    const char *key, const char *value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL) || (value == NULL))
 +    return (-EINVAL);
 +
 +  e = md_entry_alloc (key);
 +  if (e == NULL)
 +    return (-ENOMEM);
 +
 +  e->value.mv_string = md_strdup (value);
 +  if (e->value.mv_string == NULL)
 +  {
 +    ERROR ("meta_data_add_string: md_strdup failed.");
 +    md_entry_free (e);
 +    return (-ENOMEM);
 +  }
 +  e->type = MD_TYPE_STRING;
 +
 +  return (md_entry_insert (md, e));
 +} /* }}} int meta_data_add_string */
 +
 +int meta_data_add_signed_int (meta_data_t *md, /* {{{ */
 +    const char *key, int64_t value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (-EINVAL);
 +
 +  e = md_entry_alloc (key);
 +  if (e == NULL)
 +    return (-ENOMEM);
 +
 +  e->value.mv_signed_int = value;
 +  e->type = MD_TYPE_SIGNED_INT;
 +
 +  return (md_entry_insert (md, e));
 +} /* }}} int meta_data_add_signed_int */
 +
 +int meta_data_add_unsigned_int (meta_data_t *md, /* {{{ */
 +    const char *key, uint64_t value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (-EINVAL);
 +
 +  e = md_entry_alloc (key);
 +  if (e == NULL)
 +    return (-ENOMEM);
 +
 +  e->value.mv_unsigned_int = value;
 +  e->type = MD_TYPE_UNSIGNED_INT;
 +
 +  return (md_entry_insert (md, e));
 +} /* }}} int meta_data_add_unsigned_int */
 +
 +int meta_data_add_double (meta_data_t *md, /* {{{ */
 +    const char *key, double value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (-EINVAL);
 +
 +  e = md_entry_alloc (key);
 +  if (e == NULL)
 +    return (-ENOMEM);
 +
 +  e->value.mv_double = value;
 +  e->type = MD_TYPE_DOUBLE;
 +
 +  return (md_entry_insert (md, e));
 +} /* }}} int meta_data_add_double */
 +
 +int meta_data_add_boolean (meta_data_t *md, /* {{{ */
 +    const char *key, _Bool value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL))
 +    return (-EINVAL);
 +
 +  e = md_entry_alloc (key);
 +  if (e == NULL)
 +    return (-ENOMEM);
 +
 +  e->value.mv_boolean = value;
 +  e->type = MD_TYPE_BOOLEAN;
 +
 +  return (md_entry_insert (md, e));
 +} /* }}} int meta_data_add_boolean */
 +
 +/*
 + * Get functions
 + */
 +int meta_data_get_string (meta_data_t *md, /* {{{ */
 +    const char *key, char **value)
 +{
 +  meta_entry_t *e;
 +  char *temp;
 +
 +  if ((md == NULL) || (key == NULL) || (value == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  e = md_entry_lookup (md, key);
 +  if (e == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  if (e->type != MD_TYPE_STRING)
 +  {
-     ERROR ("meta_data_get_signed_int: Type mismatch for key `%s'", e->key);
++    ERROR ("meta_data_get_string: Type mismatch for key `%s'", e->key);
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  temp = md_strdup (e->value.mv_string);
 +  if (temp == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    ERROR ("meta_data_get_string: md_strdup failed.");
 +    return (-ENOMEM);
 +  }
 + 
 +  pthread_mutex_unlock (&md->lock);
 +
 +  *value = temp;
 +
 +  return (0);
 +} /* }}} int meta_data_get_string */
 +
 +int meta_data_get_signed_int (meta_data_t *md, /* {{{ */
 +    const char *key, int64_t *value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL) || (value == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  e = md_entry_lookup (md, key);
 +  if (e == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  if (e->type != MD_TYPE_SIGNED_INT)
 +  {
 +    ERROR ("meta_data_get_signed_int: Type mismatch for key `%s'", e->key);
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  *value = e->value.mv_signed_int;
 +
 +  pthread_mutex_unlock (&md->lock);
 +  return (0);
 +} /* }}} int meta_data_get_signed_int */
 +
 +int meta_data_get_unsigned_int (meta_data_t *md, /* {{{ */
 +    const char *key, uint64_t *value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL) || (value == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  e = md_entry_lookup (md, key);
 +  if (e == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  if (e->type != MD_TYPE_UNSIGNED_INT)
 +  {
 +    ERROR ("meta_data_get_unsigned_int: Type mismatch for key `%s'", e->key);
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  *value = e->value.mv_unsigned_int;
 +
 +  pthread_mutex_unlock (&md->lock);
 +  return (0);
 +} /* }}} int meta_data_get_unsigned_int */
 +
 +int meta_data_get_double (meta_data_t *md, /* {{{ */
 +    const char *key, double *value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL) || (value == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  e = md_entry_lookup (md, key);
 +  if (e == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  if (e->type != MD_TYPE_DOUBLE)
 +  {
 +    ERROR ("meta_data_get_double: Type mismatch for key `%s'", e->key);
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  *value = e->value.mv_double;
 +
 +  pthread_mutex_unlock (&md->lock);
 +  return (0);
 +} /* }}} int meta_data_get_double */
 +
 +int meta_data_get_boolean (meta_data_t *md, /* {{{ */
 +    const char *key, _Bool *value)
 +{
 +  meta_entry_t *e;
 +
 +  if ((md == NULL) || (key == NULL) || (value == NULL))
 +    return (-EINVAL);
 +
 +  pthread_mutex_lock (&md->lock);
 +
 +  e = md_entry_lookup (md, key);
 +  if (e == NULL)
 +  {
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  if (e->type != MD_TYPE_BOOLEAN)
 +  {
 +    ERROR ("meta_data_get_boolean: Type mismatch for key `%s'", e->key);
 +    pthread_mutex_unlock (&md->lock);
 +    return (-ENOENT);
 +  }
 +
 +  *value = e->value.mv_boolean;
 +
 +  pthread_mutex_unlock (&md->lock);
 +  return (0);
 +} /* }}} int meta_data_get_boolean */
 +
 +/* vim: set sw=2 sts=2 et fdm=marker : */