[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-697-gbce93f6d5

[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  bce93f6d513b373c1fbfb42a12cfeb2305d5e822 (commit)
      from  390720c283992a0a6e8d7aea94924a15d3c8e900 (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 bce93f6d513b373c1fbfb42a12cfeb2305d5e822
Author: Tim Newsome <ti...@si...>
Date:   Mon May 16 10:22:32 2022 -0700

    Give each SMP group a unique number.
    
    This helps e.g. if there are 8 cores, and cores 0--3 are in one SMP
    group while 4--7 are in another group. (And there are 2 gdb instances
    connected, one debugging the first group, and one the second.)
    
    Signed-off-by: Tim Newsome <ti...@si...>
    Change-Id: I7b6c9382eadf964529105eaf0411a42d48768668
    Reviewed-on: https://review.openocd.org/c/openocd/+/6979
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/target.c b/src/target/target.c
index 8edd63291..596364cdc 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6444,6 +6444,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	int i;
 	const char *targetname;
 	int retval, len;
+	static int smp_group = 1;
 	struct target *target = NULL;
 	struct target_list *head, *new;
 
@@ -6475,9 +6476,10 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	/*  now parse the list of cpu and put the target in smp mode*/
 	foreach_smp_target(head, lh) {
 		target = head->target;
-		target->smp = 1;
+		target->smp = smp_group;
 		target->smp_targets = lh;
 	}
+	smp_group++;
 
 	if (target && target->rtos)
 		retval = rtos_smp_init(target);
diff --git a/src/target/target.h b/src/target/target.h
index 1f1a35420..45ef96269 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -200,7 +200,7 @@ struct target {
 	bool rtos_auto_detect;				/* A flag that indicates that the RTOS has been specified as "auto"
 										 * and must be detected when symbols are offered */
 	struct backoff_timer backoff;
-	int smp;							/* add some target attributes for smp support */
+	int smp;							/* Unique non-zero number for each SMP group */
 	struct list_head *smp_targets;		/* list all targets in this smp group/cluster
 										 * The head of the list is shared between the
 										 * cluster, thus here there is a pointer */

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

Summary of changes:
 src/target/target.c | 4 +++-
 src/target/target.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository