X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_match.h;h=1cff1eb755092a4734bcb9291e6ed79729af8341;hb=733fc645b6389d1f42aef8f1c1631f1db7d58196;hp=24517b3ad42ef4d558acda75d76bc971933162e0;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/utils_match.h b/src/utils_match.h index 24517b3a..1cff1eb7 100644 --- a/src/utils_match.h +++ b/src/utils_match.h @@ -2,53 +2,65 @@ * collectd - src/utils_match.h * Copyright (C) 2008-2014 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * 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 octo Forster + * Florian octo Forster **/ #ifndef UTILS_MATCH_H #define UTILS_MATCH_H 1 #include "plugin.h" +#include "utils_latency.h" /* - * Defines + * Each type may have 12 sub-types + * 0x1000 = 1000000000000 + * ^ <- Type bit + * ^^^^^^^^^^^^ <- Subtype bits */ -#define UTILS_MATCH_DS_TYPE_GAUGE 0x10 -#define UTILS_MATCH_DS_TYPE_COUNTER 0x20 -#define UTILS_MATCH_DS_TYPE_DERIVE 0x40 -#define UTILS_MATCH_DS_TYPE_ABSOLUTE 0x80 +#define UTILS_MATCH_DS_TYPE_GAUGE 0x1000 +#define UTILS_MATCH_DS_TYPE_COUNTER 0x2000 +#define UTILS_MATCH_DS_TYPE_DERIVE 0x4000 +#define UTILS_MATCH_DS_TYPE_ABSOLUTE 0x8000 #define UTILS_MATCH_CF_GAUGE_AVERAGE 0x01 -#define UTILS_MATCH_CF_GAUGE_MIN 0x02 -#define UTILS_MATCH_CF_GAUGE_MAX 0x04 -#define UTILS_MATCH_CF_GAUGE_LAST 0x08 - -#define UTILS_MATCH_CF_COUNTER_SET 0x01 -#define UTILS_MATCH_CF_COUNTER_ADD 0x02 -#define UTILS_MATCH_CF_COUNTER_INC 0x04 - -#define UTILS_MATCH_CF_DERIVE_SET 0x01 -#define UTILS_MATCH_CF_DERIVE_ADD 0x02 -#define UTILS_MATCH_CF_DERIVE_INC 0x04 - -#define UTILS_MATCH_CF_ABSOLUTE_SET 0x01 -#define UTILS_MATCH_CF_ABSOLUTE_ADD 0x02 -#define UTILS_MATCH_CF_ABSOLUTE_INC 0x04 +#define UTILS_MATCH_CF_GAUGE_MIN 0x02 +#define UTILS_MATCH_CF_GAUGE_MAX 0x04 +#define UTILS_MATCH_CF_GAUGE_LAST 0x08 +#define UTILS_MATCH_CF_GAUGE_INC 0x10 +#define UTILS_MATCH_CF_GAUGE_ADD 0x20 +#define UTILS_MATCH_CF_GAUGE_PERSIST 0x40 +#define UTILS_MATCH_CF_GAUGE_DIST 0x80 + +#define UTILS_MATCH_CF_COUNTER_SET 0x01 +#define UTILS_MATCH_CF_COUNTER_ADD 0x02 +#define UTILS_MATCH_CF_COUNTER_INC 0x04 + +#define UTILS_MATCH_CF_DERIVE_SET 0x01 +#define UTILS_MATCH_CF_DERIVE_ADD 0x02 +#define UTILS_MATCH_CF_DERIVE_INC 0x04 + +#define UTILS_MATCH_CF_ABSOLUTE_SET 0x01 +#define UTILS_MATCH_CF_ABSOLUTE_ADD 0x02 +#define UTILS_MATCH_CF_ABSOLUTE_INC 0x04 /* * Data types @@ -56,11 +68,11 @@ struct cu_match_s; typedef struct cu_match_s cu_match_t; -struct cu_match_value_s -{ +struct cu_match_value_s { int ds_type; value_t value; unsigned int values_num; + latency_counter_t *latency; }; typedef struct cu_match_value_s cu_match_value_t; @@ -84,11 +96,14 @@ typedef struct cu_match_value_s cu_match_value_t; * callback. * The optional `excluderegex' allows to exclude the line from the match, if * the excluderegex matches. + * When `match_destroy' is called the `user_data' pointer is freed using + * the `free_user_data' callback - if it is not NULL. */ -cu_match_t *match_create_callback (const char *regex, const char *excluderegex, - int (*callback) (const char *str, - char * const *matches, size_t matches_num, void *user_data), - void *user_data); +cu_match_t * +match_create_callback(const char *regex, const char *excluderegex, + int (*callback)(const char *str, char *const *matches, + size_t matches_num, void *user_data), + void *user_data, void (*free_user_data)(void *user_data)); /* * NAME @@ -114,8 +129,8 @@ cu_match_t *match_create_callback (const char *regex, const char *excluderegex, * The function will not search for anything in the string and increase * value.counter by one. */ -cu_match_t *match_create_simple (const char *regex, - const char *excluderegex, int ds_type); +cu_match_t *match_create_simple(const char *regex, const char *excluderegex, + int ds_type); /* * NAME @@ -126,7 +141,7 @@ cu_match_t *match_create_simple (const char *regex, * after each iteration for "simple" matches, usually after dispatching the * metrics. */ -void match_value_reset (cu_match_value_t *mv); +void match_value_reset(cu_match_value_t *mv); /* * NAME @@ -135,7 +150,7 @@ void match_value_reset (cu_match_value_t *mv); * DESCRIPTION * Destroys the object and frees all internal resources. */ -void match_destroy (cu_match_t *obj); +void match_destroy(cu_match_t *obj); /* * NAME @@ -149,7 +164,7 @@ void match_destroy (cu_match_t *obj); * automatically. The `cu_match_value_t' structure allocated by * `match_create_callback' is freed automatically. */ -int match_apply (cu_match_t *obj, const char *str); +int match_apply(cu_match_t *obj, const char *str); /* * NAME @@ -159,8 +174,6 @@ int match_apply (cu_match_t *obj, const char *str); * Returns the pointer passed to `match_create_callback' or a pointer to the * `cu_match_value_t' structure allocated by `match_create_simple'. */ -void *match_get_user_data (cu_match_t *obj); +void *match_get_user_data(cu_match_t *obj); #endif /* UTILS_MATCH_H */ - -/* vim: set sw=2 sts=2 ts=8 : */