X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftarget_set.c;h=6115639b5bcd73679b41f4a5623b0f38b43cbd69;hb=72a76347831a848e6722d9147297a1e03c4c01d8;hp=61b50b646a95e8c57f79771d85b85b698681c276;hpb=5f2da192c3eb9318d516a25654b7f1d94c55fdb3;p=collectd.git diff --git a/src/target_set.c b/src/target_set.c index 61b50b64..6115639b 100644 --- a/src/target_set.c +++ b/src/target_set.c @@ -1,59 +1,29 @@ /** * collectd - src/target_set.c - * Copyright (C) 2008 Florian Forster + * Copyright (C) 2008 Florian 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 - * Free Software Foundation; only version 2 of the License is applicable. + * 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: * - * 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. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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 + * 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 Forster + * Florian Forster **/ -/* - * First tell the compiler to stick to the C99 and POSIX standards as close as - * possible. - */ -#ifndef __STRICT_ANSI__ /* {{{ */ -# define __STRICT_ANSI__ -#endif - -#ifndef _ISOC99_SOURCE -# define _ISOC99_SOURCE -#endif - -#ifdef _POSIX_C_SOURCE -# undef _POSIX_C_SOURCE -#endif -#define _POSIX_C_SOURCE 200112L - -#ifdef _XOPEN_SOURCE -# undef _XOPEN_SOURCE -#endif -#define _XOPEN_SOURCE 600 - -#ifndef _REENTRANT -# define _REENTRANT -#endif - -#ifndef _THREAD_SAFE -# define _THREAD_SAFE -#endif - -#ifdef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* }}} */ - #include "collectd.h" #include "common.h" #include "filter_chain.h" @@ -65,62 +35,86 @@ struct ts_data_s char *plugin_instance; /* char *type; */ char *type_instance; + meta_data_t *meta; }; typedef struct ts_data_s ts_data_t; -static char *ts_strdup (const char *orig) /* {{{ */ +static int ts_util_get_key_and_string_wo_strdup (const oconfig_item_t *ci, char **ret_key, char **ret_string) /* {{{ */ { - size_t sz; - char *dest; - - if (orig == NULL) - return (NULL); - - sz = strlen (orig) + 1; - dest = (char *) malloc (sz); - if (dest == NULL) - return (NULL); + if ((ci->values_num != 2) + || (ci->values[0].type != OCONFIG_TYPE_STRING) + || (ci->values[1].type != OCONFIG_TYPE_STRING)) + { + ERROR ("ts_util_get_key_and_string_wo_strdup: The %s option requires " + "exactly two string argument.", ci->key); + return (-1); + } - memcpy (dest, orig, sz); + *ret_key = ci->values[0].value.string; + *ret_string = ci->values[1].value.string; - return (dest); -} /* }}} char *ts_strdup */ + return (0); +} /* }}} int ts_util_get_key_and_string_wo_strdup */ static int ts_config_add_string (char **dest, /* {{{ */ const oconfig_item_t *ci, int may_be_empty) { - char *temp; + char *tmp = NULL; + int status; - if (dest == NULL) - return (-EINVAL); + status = cf_util_get_string (ci, &tmp); + if (status != 0) + return (status); - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_STRING)) + if (!may_be_empty && (strlen (tmp) == 0)) { - ERROR ("Target `set': The `%s' option requires exactly one string " - "argument.", ci->key); + ERROR ("Target `set': The `%s' option does not accept empty strings.", + ci->key); + sfree (tmp); return (-1); } - if ((!may_be_empty) && (ci->values[0].value.string[0] == 0)) + *dest = tmp; + return (0); +} /* }}} int ts_config_add_string */ + +static int ts_config_add_meta (meta_data_t **dest, /* {{{ */ + const oconfig_item_t *ci, int may_be_empty) +{ + char *key = NULL; + char *string = NULL; + int status; + + status = ts_util_get_key_and_string_wo_strdup (ci, &key, &string); + if (status != 0) + return (status); + + if (strlen (key) == 0) { - ERROR ("Target `set': The `%s' option does not accept empty strings.", + ERROR ("Target `set': The `%s' option does not accept empty string as first argument.", ci->key); return (-1); } - temp = ts_strdup (ci->values[0].value.string); - if (temp == NULL) + if (!may_be_empty && (strlen (string) == 0)) { - ERROR ("ts_config_add_string: ts_strdup failed."); + ERROR ("Target `set': The `%s' option does not accept empty string as second argument.", + ci->key); return (-1); } - free (*dest); - *dest = temp; + if ((*dest) == NULL) + { + // Create a new meta_data_t + if ((*dest = meta_data_create()) == NULL) + { + ERROR ("Target `set': failed to create a meta data for `%s'.", ci->key); + return (-1); + } + } - return (0); -} /* }}} int ts_config_add_string */ + return (meta_data_add_string (*dest, key, string)); +} /* }}} int ts_config_add_meta */ static int ts_destroy (void **user_data) /* {{{ */ { @@ -138,6 +132,7 @@ static int ts_destroy (void **user_data) /* {{{ */ free (data->plugin_instance); /* free (data->type); */ free (data->type_instance); + meta_data_destroy(data->meta); free (data); return (0); @@ -149,19 +144,19 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ int status; int i; - data = (ts_data_t *) malloc (sizeof (*data)); + data = calloc (1, sizeof (*data)); if (data == NULL) { - ERROR ("ts_create: malloc failed."); + ERROR ("ts_create: calloc failed."); return (-ENOMEM); } - memset (data, 0, sizeof (*data)); data->host = NULL; data->plugin = NULL; data->plugin_instance = NULL; /* data->type = NULL; */ data->type_instance = NULL; + data->meta = NULL; status = 0; for (i = 0; i < ci->children_num; i++) @@ -186,6 +181,9 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ else if (strcasecmp ("TypeInstance", child->key) == 0) status = ts_config_add_string (&data->type_instance, child, /* may be empty = */ 1); + else if (strcasecmp ("MetaDataSet", child->key) == 0) + status = ts_config_add_meta (&data->meta, child, + /* may be empty = */ 1); else { ERROR ("Target `set': The `%s' configuration option is not understood " @@ -204,10 +202,12 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ && (data->plugin == NULL) && (data->plugin_instance == NULL) /* && (data->type == NULL) */ - && (data->type_instance == NULL)) + && (data->type_instance == NULL) + && (data->meta == NULL)) { - ERROR ("Target `set': You need to set at lease one of `Host', " - "`Plugin', `PluginInstance', `Type', or `TypeInstance'."); + ERROR ("Target `set': You need to set at least one of `Host', " + "`Plugin', `PluginInstance', `TypeInstance', " + "`MetaDataSet' or `MetaDataEval'."); status = -1; } @@ -239,6 +239,11 @@ static int ts_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ return (-EINVAL); } + if (data->meta != NULL) + { + meta_data_clone_merge(&(vl->meta), data->meta); + } + #define SET_FIELD(f) if (data->f != NULL) { sstrncpy (vl->f, data->f, sizeof (vl->f)); } SET_FIELD (host); SET_FIELD (plugin);