X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftarget_v5upgrade.c;h=3f2c9583f51a31c4196f922faab05daccfb1a9c0;hb=f7649ae4a3270efe73f55bd00ca7fb89f269b8ec;hp=25f4637d15b8afd75363b3256f8a78ca45aa4788;hpb=ef4a3db895a0aba7107c0f1c6c2ef2a7f128aaf8;p=collectd.git diff --git a/src/target_v5upgrade.c b/src/target_v5upgrade.c index 25f4637d..3f2c9583 100644 --- a/src/target_v5upgrade.c +++ b/src/target_v5upgrade.c @@ -1,26 +1,31 @@ /** - * collectd - src/target_set.c + * collectd - src/target_v5upgrade.c * Copyright (C) 2008-2010 Florian Forster * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; only version 2.1 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 - * Lesser 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 Lesser 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 **/ #include "collectd.h" + #include "plugin.h" #include "common.h" #include "filter_chain.h" @@ -48,7 +53,6 @@ static void v5_swap_instances (value_list_t *vl) /* {{{ */ static int v5_df (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; /* Can't upgrade if both instances have been set. */ if ((vl->plugin_instance[0] != 0) @@ -59,7 +63,7 @@ static int v5_df (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -108,7 +112,6 @@ static int v5_interface (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_mysql_qcache (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; if (vl->values_len != 5) return (FC_TARGET_STOP); @@ -117,7 +120,7 @@ static int v5_mysql_qcache (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -166,7 +169,6 @@ static int v5_mysql_qcache (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_mysql_threads (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; if (vl->values_len != 4) return (FC_TARGET_STOP); @@ -175,7 +177,7 @@ static int v5_mysql_threads (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -219,7 +221,6 @@ static int v5_mysql_threads (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_zfs_arc_counts (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; _Bool is_hits; if (vl->values_len != 4) @@ -236,7 +237,7 @@ static int v5_zfs_arc_counts (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -280,7 +281,6 @@ static int v5_zfs_arc_counts (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_values[2]; if (vl->values_len != 2) return (FC_TARGET_STOP); @@ -289,8 +289,6 @@ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ * memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = new_values; - new_vl.values_len = 2; new_vl.meta = NULL; /* Change the type/-instance to "io_octets-L2" */ @@ -298,8 +296,12 @@ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ * sstrncpy (new_vl.type_instance, "L2", sizeof (new_vl.type_instance)); /* Copy the actual values. */ - new_vl.values[0].derive = (derive_t) vl->values[0].counter; - new_vl.values[1].derive = (derive_t) vl->values[1].counter; + value_t values[] = { + { .derive = (derive_t) vl->values[0].counter }, + { .derive = (derive_t) vl->values[1].counter }, + }; + new_vl.values = values; + new_vl.values_len = STATIC_ARRAY_SIZE (values); /* Dispatch new value lists instead of this one */ plugin_dispatch_values (&new_vl); @@ -317,7 +319,6 @@ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ * static int v5_zfs_arc_l2_size (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; if (vl->values_len != 1) return (FC_TARGET_STOP); @@ -326,7 +327,7 @@ static int v5_zfs_arc_l2_size (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -354,7 +355,6 @@ static int v5_zfs_arc_l2_size (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_zfs_arc_ratio (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; if (vl->values_len != 1) return (FC_TARGET_STOP); @@ -363,7 +363,7 @@ static int v5_zfs_arc_ratio (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -392,7 +392,6 @@ static int v5_zfs_arc_ratio (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_zfs_arc_size (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_value; if (vl->values_len != 4) return (FC_TARGET_STOP); @@ -401,7 +400,7 @@ static int v5_zfs_arc_size (const data_set_t *ds, value_list_t *vl) /* {{{ */ memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = &new_value; + new_vl.values = &(value_t) { .gauge = NAN }; new_vl.values_len = 1; new_vl.meta = NULL; @@ -459,9 +458,8 @@ static int v5_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ void module_register (void) { - target_proc_t tproc; + target_proc_t tproc = { 0 }; - memset (&tproc, 0, sizeof (tproc)); tproc.create = v5_create; tproc.destroy = v5_destroy; tproc.invoke = v5_invoke;