X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_match.c;h=8e9b32c310b7ce241af09ec1d41c53ea6c434fcc;hp=9e75e4e2bdfacfe4dee2a67fc117809ac9fd1792;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=66e0fe82631c8a8e44ffcad8ffd378fab83bc83f diff --git a/src/utils_match.c b/src/utils_match.c index 9e75e4e2..8e9b32c3 100644 --- a/src/utils_match.c +++ b/src/utils_match.c @@ -1,23 +1,27 @@ /** * collectd - src/utils_match.c - * Copyright (C) 2008 Florian octo Forster + * Copyright (C) 2008 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 **/ #include "collectd.h" @@ -29,10 +33,12 @@ #include #define UTILS_MATCH_FLAGS_FREE_USER_DATA 0x01 +#define UTILS_MATCH_FLAGS_EXCLUDE_REGEX 0x02 struct cu_match_s { regex_t regex; + regex_t excluderegex; int flags; int (*callback) (const char *str, char * const *matches, size_t matches_num, @@ -50,7 +56,7 @@ static char *match_substr (const char *str, int begin, int end) if ((begin < 0) || (end < 0) || (begin >= end)) return (NULL); - if (end > (strlen (str) + 1)) + if ((size_t) end > (strlen (str) + 1)) { ERROR ("utils_match: match_substr: `end' points after end of string."); return (NULL); @@ -68,7 +74,7 @@ static char *match_substr (const char *str, int begin, int end) return (ret); } /* char *match_substr */ -static int default_callback (const char *str, +static int default_callback (const char __attribute__((unused)) *str, char * const *matches, size_t matches_num, void *user_data) { cu_match_value_t *data = (cu_match_value_t *) user_data; @@ -81,7 +87,7 @@ static int default_callback (const char *str, if (matches_num < 2) return (-1); - value = strtod (matches[1], &endptr); + value = (gauge_t) strtod (matches[1], &endptr); if (matches[1] == endptr) return (-1); @@ -129,7 +135,7 @@ static int default_callback (const char *str, if (matches_num < 2) return (-1); - value = strtoll (matches[1], &endptr, 0); + value = (counter_t) strtoull (matches[1], &endptr, 0); if (matches[1] == endptr) return (-1); @@ -145,6 +151,59 @@ static int default_callback (const char *str, data->values_num++; } + else if (data->ds_type & UTILS_MATCH_DS_TYPE_DERIVE) + { + derive_t value; + char *endptr = NULL; + + if (data->ds_type & UTILS_MATCH_CF_DERIVE_INC) + { + data->value.counter++; + data->values_num++; + return (0); + } + + if (matches_num < 2) + return (-1); + + value = (derive_t) strtoll (matches[1], &endptr, 0); + if (matches[1] == endptr) + return (-1); + + if (data->ds_type & UTILS_MATCH_CF_DERIVE_SET) + data->value.derive = value; + else if (data->ds_type & UTILS_MATCH_CF_DERIVE_ADD) + data->value.derive += value; + else + { + ERROR ("utils_match: default_callback: obj->ds_type is invalid!"); + return (-1); + } + + data->values_num++; + } + else if (data->ds_type & UTILS_MATCH_DS_TYPE_ABSOLUTE) + { + absolute_t value; + char *endptr = NULL; + + if (matches_num < 2) + return (-1); + + value = (absolute_t) strtoull (matches[1], &endptr, 0); + if (matches[1] == endptr) + return (-1); + + if (data->ds_type & UTILS_MATCH_CF_ABSOLUTE_SET) + data->value.absolute = value; + else + { + ERROR ("utils_match: default_callback: obj->ds_type is invalid!"); + return (-1); + } + + data->values_num++; + } else { ERROR ("utils_match: default_callback: obj->ds_type is invalid!"); @@ -157,7 +216,7 @@ static int default_callback (const char *str, /* * Public functions */ -cu_match_t *match_create_callback (const char *regex, +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) @@ -165,14 +224,15 @@ cu_match_t *match_create_callback (const char *regex, cu_match_t *obj; int status; - DEBUG ("utils_match: match_create_callback: regex = %s", regex); + DEBUG ("utils_match: match_create_callback: regex = %s, excluderegex = %s", + regex, excluderegex); obj = (cu_match_t *) malloc (sizeof (cu_match_t)); if (obj == NULL) return (NULL); memset (obj, '\0', sizeof (cu_match_t)); - status = regcomp (&obj->regex, regex, REG_EXTENDED); + status = regcomp (&obj->regex, regex, REG_EXTENDED | REG_NEWLINE); if (status != 0) { ERROR ("Compiling the regular expression \"%s\" failed.", regex); @@ -180,13 +240,26 @@ cu_match_t *match_create_callback (const char *regex, return (NULL); } + if (excluderegex && strcmp(excluderegex, "") != 0) { + status = regcomp (&obj->excluderegex, excluderegex, REG_EXTENDED); + if (status != 0) + { + ERROR ("Compiling the excluding regular expression \"%s\" failed.", + excluderegex); + sfree (obj); + return (NULL); + } + obj->flags |= UTILS_MATCH_FLAGS_EXCLUDE_REGEX; + } + obj->callback = callback; obj->user_data = user_data; return (obj); } /* cu_match_t *match_create_callback */ -cu_match_t *match_create_simple (const char *regex, int match_ds_type) +cu_match_t *match_create_simple (const char *regex, + const char *excluderegex, int match_ds_type) { cu_match_value_t *user_data; cu_match_t *obj; @@ -197,7 +270,8 @@ cu_match_t *match_create_simple (const char *regex, int match_ds_type) memset (user_data, '\0', sizeof (cu_match_value_t)); user_data->ds_type = match_ds_type; - obj = match_create_callback (regex, default_callback, user_data); + obj = match_create_callback (regex, excluderegex, + default_callback, user_data); if (obj == NULL) { sfree (user_data); @@ -228,11 +302,22 @@ int match_apply (cu_match_t *obj, const char *str) regmatch_t re_match[32]; char *matches[32]; size_t matches_num; - int i; + size_t i; if ((obj == NULL) || (str == NULL)) return (-1); + if (obj->flags & UTILS_MATCH_FLAGS_EXCLUDE_REGEX) { + status = regexec (&obj->excluderegex, str, + STATIC_ARRAY_SIZE (re_match), re_match, + /* eflags = */ 0); + /* Regex did match, so exclude this line */ + if (status == 0) { + DEBUG("ExludeRegex matched, don't count that line\n"); + return (0); + } + } + status = regexec (&obj->regex, str, STATIC_ARRAY_SIZE (re_match), re_match, /* eflags = */ 0);