From 8578291921757dae5051e81a311940d1b8f22227 Mon Sep 17 00:00:00 2001
From: "John H. Hartman" <jhh67@users.noreply.github.com>
Date: Fri, 2 Jun 2023 13:57:26 -0700
Subject: [PATCH] Change wording of multi-locale informational message

Change the wording of the multi-locale informational message from the form

    executing on node 8 of 10 node(s): amd-0005

to the form

    executing locale 8 of 10 on node 'amd-0005'

to make the distincion between locales and nodes clearer.

Signed-off-by: John H. Hartman <jhh67@users.noreply.github.com>
---
 runtime/src/comm/gasnet/comm-gasnet.c                           | 2 +-
 runtime/src/comm/ofi/comm-ofi.c                                 | 2 +-
 runtime/src/comm/ugni/comm-ugni.c                               | 2 +-
 .../multilocale/numLocales/bradc/testVFlag.comm-gasnet.goodcont | 2 +-
 test/multilocale/numLocales/bradc/testVFlag.comm-ofi.goodcont   | 2 +-
 test/multilocale/numLocales/bradc/testVFlag.comm-ugni.goodcont  | 2 +-
 test/multilocale/numLocales/bradc/testVFlag.prediff             | 2 +-
 .../numLocales/bradc/testVerboseFlag.comm-gasnet.goodcont       | 2 +-
 .../numLocales/bradc/testVerboseFlag.comm-ofi.goodcont          | 2 +-
 .../numLocales/bradc/testVerboseFlag.comm-ugni.goodcont         | 2 +-
 test/multilocale/numLocales/bradc/testVerboseFlag.prediff       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/runtime/src/comm/gasnet/comm-gasnet.c b/runtime/src/comm/gasnet/comm-gasnet.c
index 6421f6f6b808..7421eedf9c61 100644
--- a/runtime/src/comm/gasnet/comm-gasnet.c
+++ b/runtime/src/comm/gasnet/comm-gasnet.c
@@ -965,7 +965,7 @@ void chpl_comm_rollcall(void) {
   // Initialize diags
   chpl_comm_diags_init();
 
-  chpl_msg(2, "executing on node %d of %d node(s): %s\n", chpl_nodeID,
+  chpl_msg(2, "executing locale %d of %d on node '%s'\n", chpl_nodeID,
            chpl_numNodes, chpl_nodeName());
 }
 
diff --git a/runtime/src/comm/ofi/comm-ofi.c b/runtime/src/comm/ofi/comm-ofi.c
index d841caaf1722..c608adf29e42 100644
--- a/runtime/src/comm/ofi/comm-ofi.c
+++ b/runtime/src/comm/ofi/comm-ofi.c
@@ -3109,7 +3109,7 @@ void chpl_comm_rollcall(void) {
   // Initialize diags
   chpl_comm_diags_init();
 
-  chpl_msg(2, "executing on node %d of %d node(s): %s\n", chpl_nodeID,
+  chpl_msg(2, "executing locale %d of %d on node '%s'\n", chpl_nodeID,
            chpl_numNodes, chpl_nodeName());
 
   //
diff --git a/runtime/src/comm/ugni/comm-ugni.c b/runtime/src/comm/ugni/comm-ugni.c
index cea88a58e985..641e58825fe7 100644
--- a/runtime/src/comm/ugni/comm-ugni.c
+++ b/runtime/src/comm/ugni/comm-ugni.c
@@ -3009,7 +3009,7 @@ void chpl_comm_rollcall(void)
   // Initialize diags
   chpl_comm_diags_init();
 
-  chpl_msg(2, "executing on node %d of %d node(s): %s\n", chpl_nodeID,
+  chpl_msg(2, "executing locale %d of %d on node '%s'\n", chpl_nodeID,
            chpl_numNodes, chpl_nodeName());
 
   if (chpl_numNodes == 1)
diff --git a/test/multilocale/numLocales/bradc/testVFlag.comm-gasnet.goodcont b/test/multilocale/numLocales/bradc/testVFlag.comm-gasnet.goodcont
index 55714f97f55f..596ee9361c41 100644
--- a/test/multilocale/numLocales/bradc/testVFlag.comm-gasnet.goodcont
+++ b/test/multilocale/numLocales/bradc/testVFlag.comm-gasnet.goodcont
@@ -1 +1 @@
-executing on node 0 of 1 node(s): UNAME
+executing locale 0 of 1 on node 'UNAME'
diff --git a/test/multilocale/numLocales/bradc/testVFlag.comm-ofi.goodcont b/test/multilocale/numLocales/bradc/testVFlag.comm-ofi.goodcont
index 55714f97f55f..596ee9361c41 100644
--- a/test/multilocale/numLocales/bradc/testVFlag.comm-ofi.goodcont
+++ b/test/multilocale/numLocales/bradc/testVFlag.comm-ofi.goodcont
@@ -1 +1 @@
-executing on node 0 of 1 node(s): UNAME
+executing locale 0 of 1 on node 'UNAME'
diff --git a/test/multilocale/numLocales/bradc/testVFlag.comm-ugni.goodcont b/test/multilocale/numLocales/bradc/testVFlag.comm-ugni.goodcont
index 55714f97f55f..596ee9361c41 100644
--- a/test/multilocale/numLocales/bradc/testVFlag.comm-ugni.goodcont
+++ b/test/multilocale/numLocales/bradc/testVFlag.comm-ugni.goodcont
@@ -1 +1 @@
-executing on node 0 of 1 node(s): UNAME
+executing locale 0 of 1 on node 'UNAME'
diff --git a/test/multilocale/numLocales/bradc/testVFlag.prediff b/test/multilocale/numLocales/bradc/testVFlag.prediff
index 56b7bd540ed5..146c7e6b6cd4 100755
--- a/test/multilocale/numLocales/bradc/testVFlag.prediff
+++ b/test/multilocale/numLocales/bradc/testVFlag.prediff
@@ -43,7 +43,7 @@ fi
 # aren't meaningful.
 case $target in
   cray-cs|cray-x*|hpe-cray-ex)
-     sed "s/\(executing on node 0 of 1 node(s): \).*/\1$uname/" \
+     sed "s/\(executing locale 0 of 1 on node \).*/\1'$uname'/" \
          < $2 > $2.tmp &&
      mv $2.tmp $2;;
 esac
diff --git a/test/multilocale/numLocales/bradc/testVerboseFlag.comm-gasnet.goodcont b/test/multilocale/numLocales/bradc/testVerboseFlag.comm-gasnet.goodcont
index 55714f97f55f..596ee9361c41 100644
--- a/test/multilocale/numLocales/bradc/testVerboseFlag.comm-gasnet.goodcont
+++ b/test/multilocale/numLocales/bradc/testVerboseFlag.comm-gasnet.goodcont
@@ -1 +1 @@
-executing on node 0 of 1 node(s): UNAME
+executing locale 0 of 1 on node 'UNAME'
diff --git a/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ofi.goodcont b/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ofi.goodcont
index 55714f97f55f..596ee9361c41 100644
--- a/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ofi.goodcont
+++ b/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ofi.goodcont
@@ -1 +1 @@
-executing on node 0 of 1 node(s): UNAME
+executing locale 0 of 1 on node 'UNAME'
diff --git a/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ugni.goodcont b/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ugni.goodcont
index 55714f97f55f..596ee9361c41 100644
--- a/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ugni.goodcont
+++ b/test/multilocale/numLocales/bradc/testVerboseFlag.comm-ugni.goodcont
@@ -1 +1 @@
-executing on node 0 of 1 node(s): UNAME
+executing locale 0 of 1 on node 'UNAME'
diff --git a/test/multilocale/numLocales/bradc/testVerboseFlag.prediff b/test/multilocale/numLocales/bradc/testVerboseFlag.prediff
index 56b7bd540ed5..146c7e6b6cd4 100755
--- a/test/multilocale/numLocales/bradc/testVerboseFlag.prediff
+++ b/test/multilocale/numLocales/bradc/testVerboseFlag.prediff
@@ -43,7 +43,7 @@ fi
 # aren't meaningful.
 case $target in
   cray-cs|cray-x*|hpe-cray-ex)
-     sed "s/\(executing on node 0 of 1 node(s): \).*/\1$uname/" \
+     sed "s/\(executing locale 0 of 1 on node \).*/\1'$uname'/" \
          < $2 > $2.tmp &&
      mv $2.tmp $2;;
 esac