zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

helper/command: do not capture log in script_command_run() 

Command's output should be put in JimTcl result.
We should not anymore capture the log output and pack it as a
JimTcl result.

Remove the log capture feature in script_command_run().

This change was part of http://openocd.zylin.com/1815 from Paul
Fertser and has been extracted and rebased to simplify the review.

Change-Id: Id326c8719e1cee9156d7fc15ae8355ec79a74951
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5085
Tested-by: jenkins
bscan_optimization
Paul Fertser 2019-04-04 09:35:15 +02:00 committed by Tomas Vanek
parent 7f260f5009
commit a72561ba91
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/helper/command.c
View File

@ -190,7 +190,7 @@ struct command_context *current_command_context(Jim_Interp *interp)
} }
static int script_command_run(Jim_Interp *interp, static int script_command_run(Jim_Interp *interp,
int argc, Jim_Obj * const *argv, struct command *c, bool capture) int argc, Jim_Obj * const *argv, struct command *c)
{ {
target_call_timer_callbacks_now(); target_call_timer_callbacks_now();
LOG_USER_N("%s", ""); /* Keep GDB connection alive*/ LOG_USER_N("%s", ""); /* Keep GDB connection alive*/
@ -200,15 +200,9 @@ static int script_command_run(Jim_Interp *interp,
if (NULL == words) if (NULL == words)
return JIM_ERR; return JIM_ERR;
struct log_capture_state *state = NULL;
if (capture)
state = command_log_capture_start(interp);
struct command_context *cmd_ctx = current_command_context(interp); struct command_context *cmd_ctx = current_command_context(interp);
int retval = run_command(cmd_ctx, c, (const char **)words, nwords); int retval = run_command(cmd_ctx, c, (const char **)words, nwords);
command_log_capture_finish(state);
script_command_args_free(words, nwords); script_command_args_free(words, nwords);
return command_retval_set(interp, retval); return command_retval_set(interp, retval);
} }
@ -220,7 +214,7 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
struct command *c = interp->cmdPrivData; struct command *c = interp->cmdPrivData;
assert(c); assert(c);
script_debug(interp, c->name, argc, argv); script_debug(interp, c->name, argc, argv);
return script_command_run(interp, argc, argv, c, true); return script_command_run(interp, argc, argv, c);
} }
static struct command *command_root(struct command *c) static struct command *command_root(struct command *c)
@ -1024,7 +1018,6 @@ static int command_unknown(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return JIM_OK; return JIM_OK;
} }
bool found = true;
Jim_Obj *const *start; Jim_Obj *const *start;
unsigned count; unsigned count;
if (c->handler || c->jim_handler) { if (c->handler || c->jim_handler) {
@ -1039,7 +1032,6 @@ static int command_unknown(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
} }
count = argc - remaining; count = argc - remaining;
start = argv; start = argv;
found = false;
} }
/* pass the command through to the intended handler */ /* pass the command through to the intended handler */
if (c->jim_handler) { if (c->jim_handler) {
@ -1050,7 +1042,7 @@ static int command_unknown(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return (*c->jim_handler)(interp, count, start); return (*c->jim_handler)(interp, count, start);
} }
return script_command_run(interp, count, start, c, found); return script_command_run(interp, count, start, c);
} }
static int jim_command_mode(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int jim_command_mode(Jim_Interp *interp, int argc, Jim_Obj *const *argv)