[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-862-g320043c05

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  320043c054dc0c9f274d462014bd7aafff86fe02 (commit)
      from  5d6be673c36b00eb962cbb441dd557d3cc8eb03c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 320043c054dc0c9f274d462014bd7aafff86fe02
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Sep 6 14:44:57 2022 +0200

    openocd: fix for polling during "expr" computation
    
    Commit c7eaaf620488 ("openocd: prepare for jimtcl 0.81 'expr'
    syntax change") replaces the jimtcl command "expr" with an openocd
    version that detects the TCL syntax change and prints a warning.
    The openocd "expr" command will be dropped after v0.12.0,
    
    One side effect is that openocd invokes polling the target after
    every openocd command, causing scripts that use several "expr"
    commands to run much slower; see [1].
    
    The proper fix would require openocd to invoke polling only at the
    time period deadline, instead of at each command. Such fix is too
    risky to be applied now, due to short time before v0.12.0-rc1.
    
    As a temporarily workaround, let openocd to detect the "expr"
    command and skip the polling.
    This will be dropped together with the openocd "expr" command.
    
    Change-Id: I8151aa28694817001046165a15475d64896f985e
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Fixes: https://sourceforge.net/p/openocd/tickets/362/ [1]
    Fixes: c7eaaf620488 ("openocd: prepare for jimtcl 0.81 'expr' syntax change")
    Reviewed-on: https://review.openocd.org/c/openocd/+/7174
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/helper/command.c b/src/helper/command.c
index 52f9eb6bf..b5c5459a1 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -936,7 +936,19 @@ static int jim_command_dispatch(Jim_Interp *interp, int argc, Jim_Obj * const *a
 	if (!command_can_run(cmd_ctx, c, Jim_GetString(argv[0], NULL)))
 		return JIM_ERR;
 
-	target_call_timer_callbacks_now();
+	/*
+	 * TODO: to be removed after v0.12.0
+	 * workaround for https://sourceforge.net/p/openocd/tickets/362/
+	 * After syntax change of "expr" in jimtcl 0.81
+	 * the replacement of jimtcl "expr" with openocd version in
+	 * https://review.openocd.org/6510/
+	 * introduces too many target polling during math expressions with
+	 * "expr" commands.
+	 * After v0.12.0 replace the following two lines with
+	 * target_call_timer_callbacks();
+	 */
+	if (strcmp(c->name, "expr"))
+		target_call_timer_callbacks_now();
 
 	/*
 	 * Black magic of overridden current target:

-----------------------------------------------------------------------

Summary of changes:
 src/helper/command.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository