X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=aa71f0ba18c1b2af47436423181638143ab0dd20;hb=2c5fc392f019e78ae858ffd761bcb859f898ff53;hp=9f756d412a102afea06307ec3101b392dcf1bba1;hpb=2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a;p=openocd.git diff --git a/src/helper/command.c b/src/helper/command.c index 9f756d412a..aa71f0ba18 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -29,6 +29,7 @@ #include "command.h" #include "log.h" +#include "time_support.h" #include #include @@ -37,7 +38,10 @@ #include #include +void command_print_help_line(command_context_t* context, struct command_s *command, int indent); + int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int build_unique_lengths(command_context_t *context, command_t *commands) { @@ -256,57 +260,38 @@ int parse_line(char *line, char *words[], int max_words) return nwords; } -void command_print(command_context_t *context, char *format, ...) +void command_print_n(command_context_t *context, char *format, ...) { + char *string; + va_list ap; - char *buffer = NULL; - int n, size = 0; - char *p; - va_start(ap, format); - - /* process format string */ - /* TODO: possible bug. va_list is undefined after the first call to vsnprintf */ - while (!buffer || (n = vsnprintf(buffer, size, format, ap)) >= size) - { - /* increase buffer until it fits the whole string */ - if (!(p = realloc(buffer, size += 4096))) - { - /* gotta free up */ - if (buffer) - free(buffer); - return; - } - buffer = p; - } - - /* vsnprintf failed */ - if (n < 0) + string = alloc_printf(format, ap); + if (string != NULL) { - if (buffer) - free(buffer); - return; + context->output_handler(context, string); + free(string); } - p = buffer; - - /* process lines in buffer */ - do { - char *next = strchr(p, '\n'); - - if (next) - *next++ = 0; + va_end(ap); +} - if (context->output_handler) - context->output_handler(context, p); +void command_print(command_context_t *context, char *format, ...) +{ + char *string; + + va_list ap; + va_start(ap, format); + + string = alloc_printf(format, ap); + if (string != NULL) + { + strcat(string, "\n"); /* alloc_printf guaranteed the buffer to be at least one char longer */ + context->output_handler(context, string); + free(string); + } - p = next; - } while (p); - - if (buffer) - free(buffer); - va_end(ap); } @@ -329,7 +314,7 @@ int find_and_run_command(command_context_t *context, command_t *commands, char * if (strncasecmp(c->name, words[start_word], strlen(words[start_word]))) continue; - if ((c->mode == context->mode) || (c->mode == COMMAND_ANY)) + if ((context->mode == COMMAND_CONFIG) || (c->mode == COMMAND_ANY) || (c->mode == context->mode) ) { if (!c->children) { @@ -340,7 +325,13 @@ int find_and_run_command(command_context_t *context, command_t *commands, char * } else { - return c->handler(context, c->name, words + start_word + 1, num_words - start_word - 1); + int retval = c->handler(context, c->name, words + start_word + 1, num_words - start_word - 1); + if (retval == ERROR_COMMAND_SYNTAX_ERROR) + { + command_print(context, "Syntax error:"); + command_print_help_line(context, c, 0); + } + return retval; } } else @@ -359,7 +350,7 @@ int find_and_run_command(command_context_t *context, command_t *commands, char * return ERROR_OK; } -static int command_run_line_inner(command_context_t *context, char *line) +int command_run_line(command_context_t *context, char *line) { int nwords; char *words[128] = {0}; @@ -381,10 +372,7 @@ static int command_run_line_inner(command_context_t *context, char *line) if (*line && (line[0] == '#')) return ERROR_OK; - if (context->echo) - { - command_print(context, "%s", line); - } + DEBUG("%s", line); nwords = parse_line(line, words, sizeof(words) / sizeof(words[0])); @@ -399,17 +387,6 @@ static int command_run_line_inner(command_context_t *context, char *line) return retval; } -int command_run_line(command_context_t *context, char *line) -{ - int retval=command_run_line_inner(context, line); - // we don't want any dangling callbacks! - // - // Capturing output from logging is *very* loosly modeled on C/C++ exceptions. - // the capture must be set up at function entry and - // stops when the function call returns - log_setCallback(NULL, NULL); - return retval; -} int command_run_file(command_context_t *context, FILE *file, enum command_mode mode) { int retval = ERROR_OK; @@ -452,7 +429,7 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m break; /* run line */ - if ((retval = command_run_line_inner(context, cmd)) == ERROR_COMMAND_CLOSE_CONNECTION) + if ((retval = command_run_line(context, cmd)) == ERROR_COMMAND_CLOSE_CONNECTION) break; } @@ -467,27 +444,27 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m void command_print_help_line(command_context_t* context, struct command_s *command, int indent) { command_t *c; - char indents[32] = {0}; + char indent_text[indent + 2]; char *help = "no help available"; char name_buf[64]; int i; - for (i = 0; i < indent; i+=2) + if (indent) { - indents[i*2] = ' '; - indents[i*2+1] = '-'; + indent_text[0] = ' '; + memset(indent_text + 1, '-', indent); + indent_text[indent + 1] = 0; } - indents[i*2] = 0; - if ((command->mode == COMMAND_EXEC) || (command->mode == COMMAND_ANY)) - { - if (command->help) - help = command->help; + if (command->help) + help = command->help; - snprintf(name_buf, 64, command->name); - strncat(name_buf, indents, 64); - command_print(context, "%20s\t%s", name_buf, help); - } + snprintf(name_buf, 64, command->name); + + if (indent) + strncat(name_buf, indent_text, 64); + + command_print(context, "%20s\t%s", name_buf, help, indent); if (command->children) { @@ -498,20 +475,27 @@ void command_print_help_line(command_context_t* context, struct command_s *comma } } -int command_print_help(command_context_t* context, char* name, char** args, int argc) +int command_print_help_match(command_context_t* context, command_t* c_first, char* name, char** args, int argc) { - command_t *c; + command_t * c; + int i; - for (c = context->commands; c; c = c->next) + for (c = c_first; c; c = c->next) { - if (argc == 1) + if (argc > 0) { - if (strncasecmp(c->name, args[0], c->unique_len)) - continue; + if (strncasecmp(c->name, args[0], c->unique_len)) + continue; - if (strncasecmp(c->name, args[0], strlen(args[0]))) - continue; - } + if (strncasecmp(c->name, args[0], strlen(args[0]))) + continue; + + if (argc > 1) + { + command_print_help_match(context, c->children, name, args + 1, argc - 1); + continue; + } + } command_print_help_line(context, c, 0); } @@ -519,6 +503,12 @@ int command_print_help(command_context_t* context, char* name, char** args, int return ERROR_OK; } +int command_print_help(command_context_t* context, char* name, char** args, int argc) +{ + return command_print_help_match(context, context->commands, name, args, argc); +} + + void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, char* line), void *priv) { context->output_handler = output_handler; @@ -549,7 +539,6 @@ command_context_t* command_init() context->mode = COMMAND_EXEC; context->commands = NULL; context->current_target = 0; - context->echo = 0; context->output_handler = NULL; context->output_handler_priv = NULL; @@ -559,6 +548,9 @@ command_context_t* command_init() register_command(context, NULL, "sleep", handle_sleep_command, COMMAND_ANY, "sleep for milliseconds"); + register_command(context, NULL, "time", handle_time_command, + COMMAND_ANY, "time - execute and print time it took"); + return context; } @@ -577,3 +569,27 @@ int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **ar return ERROR_OK; } + +int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc<1) + return ERROR_COMMAND_SYNTAX_ERROR; + + duration_t duration; + char *duration_text; + int retval; + + duration_start_measure(&duration); + + retval = find_and_run_command(cmd_ctx, cmd_ctx->commands, args, argc, 0); + + duration_stop_measure(&duration, &duration_text); + + float t=duration.duration.tv_sec; + t+=((float)duration.duration.tv_usec / 1000000.0); + command_print(cmd_ctx, "%s took %fs", args[0], t); + + free(duration_text); + + return retval; +}