X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=76af189477c9205f5e2a125e228789c95b78b7e4;hb=6e6c1eecf05ac8bc9e59b0967cb87e578253d5a0;hp=8d214aad3322d937e5961d4aefbeebc93dc639f0;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c index 8d214aad..76af1894 100644 --- a/src/utils_cmd_getval.c +++ b/src/utils_cmd_getval.c @@ -1,25 +1,31 @@ /** - * 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" @@ -27,120 +33,116 @@ #include "utils_parse_option.h" #include "utils_cmd_getval.h" +cmd_status_t cmd_parse_getval (size_t argc, char **argv, + cmd_getval_t *ret_getval, cmd_error_handler_t *err) +{ + char *identifier_copy; + int status; + + if (argc != 1) + { + if (argc == 0) + cmd_error (CMD_PARSE_ERROR, err, "Missing identifier."); + else + cmd_error (CMD_PARSE_ERROR, err, + "Garbage after identifier: `%s'.", argv[1]); + return (CMD_PARSE_ERROR); + } + + /* parse_identifier() modifies its first argument, + * returning pointers into it */ + identifier_copy = sstrdup (argv[0]); + + status = parse_identifier (argv[0], &ret_getval->identifier.host, + &ret_getval->identifier.plugin, &ret_getval->identifier.plugin_instance, + &ret_getval->identifier.type, &ret_getval->identifier.type_instance); + if (status != 0) + { + DEBUG ("cmd_parse_getval: Cannot parse identifier `%s'.", identifier_copy); + cmd_error (CMD_PARSE_ERROR, err, + "Cannot parse identifier `%s'.", identifier_copy); + sfree (identifier_copy); + return (CMD_PARSE_ERROR); + } + + ret_getval->raw_identifier = identifier_copy; + return (CMD_OK); +} /* cmd_status_t cmd_parse_getval */ + #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", \ + WARNING ("cmd_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) +cmd_status_t cmd_handle_getval (FILE *fh, char *buffer) { - char *command; - char *identifier; - char *identifier_copy; + cmd_error_handler_t err = { cmd_error_fh, fh }; + cmd_status_t status; + cmd_t cmd; - char *hostname; - char *plugin; - char *plugin_instance; - char *type; - char *type_instance; gauge_t *values; size_t values_num; const data_set_t *ds; - int status; - size_t i; if ((fh == NULL) || (buffer == NULL)) return (-1); - DEBUG ("utils_cmd_getval: handle_getval (fh = %p, buffer = %s);", + DEBUG ("utils_cmd_getval: cmd_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"); - return (-1); - } - assert (command != NULL); - - 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) + if ((status = cmd_parse (buffer, &cmd, &err)) != CMD_OK) + return (status); + if (cmd.type != CMD_GETVAL) { - print_to_socket (fh, "-1 Cannot parse identifier.\n"); - return (-1); + cmd_error (CMD_UNKNOWN_COMMAND, &err, + "Unexpected command: `%s'.", CMD_TO_STRING (cmd.type)); + cmd_destroy (&cmd); + return (CMD_UNKNOWN_COMMAND); } - assert (identifier != NULL); - 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); - return (-1); - } - - ds = plugin_get_ds (type); + ds = plugin_get_ds (cmd.cmd.getval.identifier.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); + DEBUG ("cmd_handle_getval: plugin_get_ds (%s) == NULL;", + cmd.cmd.getval.identifier.type); + cmd_error (CMD_ERROR, &err, "Type `%s' is unknown.\n", + cmd.cmd.getval.identifier.type); + cmd_destroy (&cmd); return (-1); } values = NULL; values_num = 0; - status = uc_get_rate_by_name (identifier, &values, &values_num); + status = uc_get_rate_by_name (cmd.cmd.getval.raw_identifier, &values, &values_num); if (status != 0) { - print_to_socket (fh, "-1 No such value\n"); - sfree (identifier_copy); - return (-1); + cmd_error (CMD_ERROR, &err, "No such value."); + cmd_destroy (&cmd); + return (CMD_ERROR); } - if ((size_t) ds->ds_num != values_num) + if (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"); + ERROR ("ds[%s]->ds_num = %zu, " + "but uc_get_rate_by_name returned %zu values.", + ds->type, ds->ds_num, values_num); + cmd_error (CMD_ERROR, &err, "Error reading value from cache."); sfree (values); - sfree (identifier_copy); - return (-1); + cmd_destroy (&cmd); + return (CMD_ERROR); } - print_to_socket (fh, "%u Value%s found\n", (unsigned int) values_num, + print_to_socket (fh, "%zu Value%s found\n", values_num, (values_num == 1) ? "" : "s"); - for (i = 0; i < values_num; i++) + for (size_t i = 0; i < values_num; i++) { print_to_socket (fh, "%s=", ds->ds[i].name); if (isnan (values[i])) @@ -154,9 +156,17 @@ int handle_getval (FILE *fh, char *buffer) } sfree (values); - sfree (identifier_copy); + cmd_destroy (&cmd); + + return (CMD_OK); +} /* cmd_status_t cmd_handle_getval */ + +void cmd_destroy_getval (cmd_getval_t *getval) +{ + if (getval == NULL) + return; - return (0); -} /* int handle_getval */ + sfree (getval->raw_identifier); +} /* void cmd_destroy_getval */ /* vim: set sw=2 sts=2 ts=8 : */