X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmeta_data.c;h=ea98ba94abf44670583ab47601e39ce6a0f68394;hb=HEAD;hp=6a336c4b67c734b62cf1516c3375b649fd826cac;hpb=e04cfcb9d1f1eed00bf11768db6d0540babe2e4e;p=collectd.git diff --git a/src/meta_data.c b/src/meta_data.c index 6a336c4b..ea98ba94 100644 --- a/src/meta_data.c +++ b/src/meta_data.c @@ -1,6 +1,6 @@ /** * collectd - src/meta_data.c - * Copyright (C) 2008,2009 Florian octo Forster + * Copyright (C) 2008-2011 Florian octo Forster * * 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 @@ -101,6 +101,24 @@ static meta_entry_t *md_entry_alloc (const char *key) /* {{{ */ 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) @@ -209,12 +227,32 @@ meta_data_t *meta_data_create (void) /* {{{ */ 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 */