X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=3df13b17e7d8f594c160205d7d22f24926634a27;hb=11011dc93691989513ff2101c221ea15dab5658a;hp=8d214aad3322d937e5961d4aefbeebc93dc639f0;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c index 8d214aad..3df13b17 100644 --- a/src/utils_cmd_getval.c +++ b/src/utils_cmd_getval.c @@ -1,45 +1,50 @@ /** - * collectd - src/utils_cms_getval.c - * Copyright (C) 2008 Florian octo Forster + * collectd - src/utils_cmd_getval.c + * 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; 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. * - * Author: - * Florian octo Forster + * Authors: + * Florian octo Forster **/ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "utils_cache.h" -#include "utils_parse_option.h" #include "utils_cmd_getval.h" +#include "utils_parse_option.h" -#define print_to_socket(fh, ...) \ - do { \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_getval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } \ - fflush(fh); \ +#define print_to_socket(fh, ...) \ + do { \ + if (fprintf(fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING("handle_getval: failed to write to socket #%i: %s", fileno(fh), \ + sstrerror(errno, errbuf, sizeof(errbuf))); \ + return -1; \ + } \ + fflush(fh); \ } while (0) -int handle_getval (FILE *fh, char *buffer) -{ +int handle_getval(FILE *fh, char *buffer) { char *command; char *identifier; char *identifier_copy; @@ -54,107 +59,93 @@ int handle_getval (FILE *fh, char *buffer) const data_set_t *ds; - int status; - size_t i; + int status; if ((fh == NULL) || (buffer == NULL)) return (-1); - DEBUG ("utils_cmd_getval: handle_getval (fh = %p, buffer = %s);", - (void *) fh, buffer); + DEBUG("utils_cmd_getval: handle_getval (fh = %p, buffer = %s);", (void *)fh, + buffer); command = NULL; - status = parse_string (&buffer, &command); - if (status != 0) - { - print_to_socket (fh, "-1 Cannot parse command.\n"); + status = parse_string(&buffer, &command); + if (status != 0) { + print_to_socket(fh, "-1 Cannot parse command.\n"); return (-1); } - assert (command != NULL); + assert(command != NULL); - if (strcasecmp ("GETVAL", command) != 0) - { - print_to_socket (fh, "-1 Unexpected command: `%s'.\n", command); + if (strcasecmp("GETVAL", command) != 0) { + print_to_socket(fh, "-1 Unexpected command: `%s'.\n", command); return (-1); } identifier = NULL; - status = parse_string (&buffer, &identifier); - if (status != 0) - { - print_to_socket (fh, "-1 Cannot parse identifier.\n"); + status = parse_string(&buffer, &identifier); + if (status != 0) { + print_to_socket(fh, "-1 Cannot parse identifier.\n"); return (-1); } - assert (identifier != NULL); + assert(identifier != NULL); - if (*buffer != 0) - { - print_to_socket (fh, "-1 Garbage after end of command: %s\n", buffer); + if (*buffer != 0) { + print_to_socket(fh, "-1 Garbage after end of command: %s\n", buffer); return (-1); } /* parse_identifier() modifies its first argument, * returning pointers into it */ - identifier_copy = sstrdup (identifier); - - status = parse_identifier (identifier_copy, &hostname, - &plugin, &plugin_instance, - &type, &type_instance); - if (status != 0) - { - DEBUG ("handle_getval: Cannot parse identifier `%s'.", identifier); - print_to_socket (fh, "-1 Cannot parse identifier `%s'.\n", identifier); - sfree (identifier_copy); + identifier_copy = sstrdup(identifier); + + status = parse_identifier(identifier_copy, &hostname, &plugin, + &plugin_instance, &type, &type_instance); + if (status != 0) { + DEBUG("handle_getval: Cannot parse identifier `%s'.", identifier); + print_to_socket(fh, "-1 Cannot parse identifier `%s'.\n", identifier); + sfree(identifier_copy); return (-1); } - ds = plugin_get_ds (type); - if (ds == NULL) - { - DEBUG ("handle_getval: plugin_get_ds (%s) == NULL;", type); - print_to_socket (fh, "-1 Type `%s' is unknown.\n", type); - sfree (identifier_copy); + ds = plugin_get_ds(type); + if (ds == NULL) { + DEBUG("handle_getval: plugin_get_ds (%s) == NULL;", type); + print_to_socket(fh, "-1 Type `%s' is unknown.\n", type); + sfree(identifier_copy); return (-1); } values = NULL; values_num = 0; - status = uc_get_rate_by_name (identifier, &values, &values_num); - if (status != 0) - { - print_to_socket (fh, "-1 No such value\n"); - sfree (identifier_copy); + status = uc_get_rate_by_name(identifier, &values, &values_num); + if (status != 0) { + print_to_socket(fh, "-1 No such value\n"); + sfree(identifier_copy); return (-1); } - if ((size_t) ds->ds_num != values_num) - { - ERROR ("ds[%s]->ds_num = %i, " - "but uc_get_rate_by_name returned %u values.", - ds->type, ds->ds_num, (unsigned int) values_num); - print_to_socket (fh, "-1 Error reading value from cache.\n"); - sfree (values); - sfree (identifier_copy); + if (ds->ds_num != values_num) { + ERROR("ds[%s]->ds_num = %zu, " + "but uc_get_rate_by_name returned %zu values.", + ds->type, ds->ds_num, values_num); + print_to_socket(fh, "-1 Error reading value from cache.\n"); + sfree(values); + sfree(identifier_copy); return (-1); } - print_to_socket (fh, "%u Value%s found\n", (unsigned int) values_num, - (values_num == 1) ? "" : "s"); - for (i = 0; i < values_num; i++) - { - print_to_socket (fh, "%s=", ds->ds[i].name); - if (isnan (values[i])) - { - print_to_socket (fh, "NaN\n"); - } - else - { - print_to_socket (fh, "%12e\n", values[i]); + print_to_socket(fh, "%zu Value%s found\n", values_num, + (values_num == 1) ? "" : "s"); + for (size_t i = 0; i < values_num; i++) { + print_to_socket(fh, "%s=", ds->ds[i].name); + if (isnan(values[i])) { + print_to_socket(fh, "NaN\n"); + } else { + print_to_socket(fh, "%12e\n", values[i]); } } - sfree (values); - sfree (identifier_copy); + sfree(values); + sfree(identifier_copy); return (0); } /* int handle_getval */