X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=f747d5b862e8cf0770698d5e3ebf7d63f8b43ebb;hp=3df13b17e7d8f594c160205d7d22f24926634a27;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=2079ee1517e34de372f58e7e2267ad5c71a8a41f diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c index 3df13b17..f747d5b8 100644 --- a/src/utils_cmd_getval.c +++ b/src/utils_cmd_getval.c @@ -33,107 +33,114 @@ #include "utils_cmd_getval.h" #include "utils_parse_option.h" +cmd_status_t cmd_parse_getval(size_t argc, char **argv, + cmd_getval_t *ret_getval, + const cmd_options_t *opts, + cmd_error_handler_t *err) { + char *identifier_copy; + int status; + + if ((ret_getval == NULL) || (opts == NULL)) { + errno = EINVAL; + cmd_error(CMD_ERROR, err, "Invalid arguments to cmd_parse_getval."); + return CMD_ERROR; + } + + 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, opts->identifier_default_host); + 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", fileno(fh), \ - sstrerror(errno, errbuf, sizeof(errbuf))); \ + WARNING("cmd_handle_getval: failed to write to socket #%i: %s", \ + fileno(fh), STRERRNO); \ return -1; \ } \ fflush(fh); \ } while (0) -int handle_getval(FILE *fh, char *buffer) { - char *command; - char *identifier; - char *identifier_copy; +cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { + 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; - if ((fh == NULL) || (buffer == NULL)) - return (-1); - - 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"); - 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) { - print_to_socket(fh, "-1 Cannot parse identifier.\n"); - return (-1); - } - assert(identifier != NULL); - - if (*buffer != 0) { - print_to_socket(fh, "-1 Garbage after end of command: %s\n", buffer); - return (-1); + return -1; + + DEBUG("utils_cmd_getval: cmd_handle_getval (fh = %p, buffer = %s);", + (void *)fh, buffer); + + if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK) + return status; + if (cmd.type != CMD_GETVAL) { + cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.", + CMD_TO_STRING(cmd.type)); + cmd_destroy(&cmd); + return CMD_UNKNOWN_COMMAND; } - /* 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); - return (-1); + 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 (ds->ds_num != values_num) { - ERROR("ds[%s]->ds_num = %zu, " - "but uc_get_rate_by_name returned %zu values.", + ERROR("ds[%s]->ds_num = %" PRIsz ", " + "but uc_get_rate_by_name returned %" PRIsz " values.", ds->type, ds->ds_num, values_num); - print_to_socket(fh, "-1 Error reading value from cache.\n"); + 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, "%zu Value%s found\n", values_num, + print_to_socket(fh, "%" PRIsz " 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); @@ -145,9 +152,14 @@ int handle_getval(FILE *fh, char *buffer) { } sfree(values); - sfree(identifier_copy); + cmd_destroy(&cmd); + + return CMD_OK; +} /* cmd_status_t cmd_handle_getval */ - return (0); -} /* int handle_getval */ +void cmd_destroy_getval(cmd_getval_t *getval) { + if (getval == NULL) + return; -/* vim: set sw=2 sts=2 ts=8 : */ + sfree(getval->raw_identifier); +} /* void cmd_destroy_getval */