X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=0ec54216b5bce3e0bffd56426b3ff4e04884cb42;hp=df12ffc1b43cde99d9e978c016c0b5f8c1e083f5;hb=881dddd84ffed3fe9923e4e5cc82c4f550c34e0a;hpb=f2a5a1ce8125936f7d96254da7e1f77867b3cb7b diff --git a/src/helper/command.c b/src/helper/command.c index df12ffc1b4..0ec54216b5 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,7 +260,7 @@ int parse_line(char *line, char *words[], int max_words) return nwords; } -void command_print(command_context_t *context, char *format, ...) +static void command_printv(command_context_t *context, char *format, va_list ap) { char *buffer = NULL; int n, size = 0; @@ -265,8 +269,6 @@ void command_print(command_context_t *context, char *format, ...) /* process format string */ for (;;) { - va_list ap; - va_start(ap, format); if (!buffer || (n = vsnprintf(buffer, size, format, ap)) >= size) { /* increase buffer until it fits the whole string */ @@ -275,16 +277,13 @@ void command_print(command_context_t *context, char *format, ...) /* gotta free up */ if (buffer) free(buffer); - va_end(ap); return; } buffer = p; - va_end(ap); continue; } - va_end(ap); break; } @@ -296,23 +295,31 @@ void command_print(command_context_t *context, char *format, ...) return; } - p = buffer; + context->output_handler(context, buffer); - /* process lines in buffer */ - do { - char *next = strchr(p, '\n'); - - if (next) - *next++ = 0; + if (buffer) + free(buffer); +} - if (context->output_handler) - context->output_handler(context, p); +void command_print_sameline(command_context_t *context, char *format, ...) +{ + va_list ap; + va_start(ap, format); + command_printv(context, format, ap); + va_end(ap); +} - p = next; - } while (p); +void command_print(command_context_t *context, char *format, ...) +{ + char *t=malloc(strlen(format)+2); + strcpy(t, format); + strcat(t, "\n"); + va_list ap; + va_start(ap, format); + command_printv(context, t, ap); + va_end(ap); + free(t); - if (buffer) - free(buffer); } int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word) @@ -345,7 +352,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 @@ -364,7 +377,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}; @@ -386,10 +399,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])); @@ -404,17 +414,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; @@ -457,7 +456,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; } @@ -472,24 +471,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->help) help = command->help; snprintf(name_buf, 64, command->name); - strncat(name_buf, indents, 64); - command_print(context, "%20s\t%s", name_buf, help); + + if (indent) + strncat(name_buf, indent_text, 64); + + command_print(context, "%20s\t%s", name_buf, help, indent); if (command->children) { @@ -500,20 +502,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); } @@ -521,6 +530,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; @@ -551,7 +566,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; @@ -561,6 +575,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; } @@ -579,3 +596,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; +}