X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_listval.c;h=f86388932080fcdf71072a4cdcf0a110b6240c36;hb=be906f960ede42f72317eab6aa6a5f116857a484;hp=6f03e757ac57b5c5d397c12821d7e6d2f45ee8c8;hpb=7a36927e0c5411c701d9e1bfd3f02a9c2f254d0f;p=collectd.git diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c index 6f03e757..f8638893 100644 --- a/src/utils_cmd_listval.c +++ b/src/utils_cmd_listval.c @@ -1,70 +1,112 @@ /** - * collectd - src/utils_cms_listval.c - * Copyright (C) 2008 Florian octo Forster + * collectd - src/utils_cmd_listval.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_cmd_listval.h" #include "utils_cache.h" +#include "utils_cmd_listval.h" +#include "utils_parse_option.h" -#define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_listval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ +cmd_status_t cmd_parse_listval(size_t argc, char **argv, + cmd_listval_t *ret_listval + __attribute__((unused)), + const cmd_options_t *opts + __attribute__((unused)), + cmd_error_handler_t *err) { + if (argc != 0) { + cmd_error(CMD_PARSE_ERROR, err, "Garbage after end of command: `%s'.", + argv[0]); + return (CMD_PARSE_ERROR); } -int handle_listval (FILE *fh, char **fields, int fields_num) -{ + return (CMD_OK); +} /* cmd_status_t cmd_parse_listval */ + +#define free_everything_and_return(status) \ + do { \ + for (size_t j = 0; j < number; j++) { \ + sfree(names[j]); \ + names[j] = NULL; \ + } \ + sfree(names); \ + sfree(times); \ + return (status); \ + } while (0) + +#define print_to_socket(fh, ...) \ + do { \ + if (fprintf(fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING("handle_listval: failed to write to socket #%i: %s", fileno(fh), \ + sstrerror(errno, errbuf, sizeof(errbuf))); \ + free_everything_and_return(CMD_ERROR); \ + } \ + fflush(fh); \ + } while (0) + +cmd_status_t cmd_handle_listval(FILE *fh, char *buffer) { + cmd_error_handler_t err = {cmd_error_fh, fh}; + cmd_status_t status; + cmd_t cmd; + char **names = NULL; - time_t *times = NULL; + cdtime_t *times = NULL; size_t number = 0; - size_t i; - int status; - - if (fields_num != 1) - { - DEBUG ("command listval: us_handle_listval: Wrong number of fields: %i", - fields_num); - print_to_socket (fh, "-1 Wrong number of fields: Got %i, expected 1.\n", - fields_num); - return (-1); + + DEBUG("utils_cmd_listval: handle_listval (fh = %p, buffer = %s);", (void *)fh, + buffer); + + if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK) + return (status); + if (cmd.type != CMD_LISTVAL) { + cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.", + CMD_TO_STRING(cmd.type)); + free_everything_and_return(CMD_UNKNOWN_COMMAND); } - status = uc_get_names (&names, ×, &number); - if (status != 0) - { - DEBUG ("command listval: uc_get_names failed with status %i", status); - print_to_socket (fh, "-1 uc_get_names failed.\n"); - return (-1); + status = uc_get_names(&names, ×, &number); + if (status != 0) { + DEBUG("command listval: uc_get_names failed with status %i", status); + cmd_error(CMD_ERROR, &err, "uc_get_names failed."); + free_everything_and_return(CMD_ERROR); } - print_to_socket (fh, "%i Value%s found\n", - (int) number, (number == 1) ? "" : "s"); - for (i = 0; i < number; i++) - print_to_socket (fh, "%u %s\n", (unsigned int) times[i], names[i]); + print_to_socket(fh, "%i Value%s found\n", (int)number, + (number == 1) ? "" : "s"); + for (size_t i = 0; i < number; i++) + print_to_socket(fh, "%.3f %s\n", CDTIME_T_TO_DOUBLE(times[i]), names[i]); + + free_everything_and_return(CMD_OK); +} /* cmd_status_t cmd_handle_listval */ - return (0); -} /* int handle_listval */ +void cmd_destroy_listval(cmd_listval_t *listval __attribute__((unused))) { + /* nothing to do */ +} /* void cmd_destroy_listval */ /* vim: set sw=2 sts=2 ts=8 : */