From b3350c8a77b9a1d2ebb770c057819e67fe969bb9 Mon Sep 17 00:00:00 2001
From: Nitin Bhat <nbhat4@illinois.edu>
Date: Wed, 27 Sep 2017 19:51:34 +0000
Subject: [PATCH] Bug #1441: lies at startup about "The comm. thread both sends
 and receives messages"

Fix for pamilrts-bluegeneq-smp layer, which doesn't have a comm. thread

Change-Id: Ia31a65a3233ca08c0654570b82697ba2320362ad
---
 src/arch/pamilrts/machine.c         | 6 ++++++
 src/arch/util/machine-common-core.c | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/arch/pamilrts/machine.c b/src/arch/pamilrts/machine.c
index f5da50c42b..f9d69f63ce 100644
--- a/src/arch/pamilrts/machine.c
+++ b/src/arch/pamilrts/machine.c
@@ -487,6 +487,12 @@ void LrtsInit(int *argc, char ***argv, int *numNodes, int *myNodeID)
   }
   cmi_pami_numcontexts = _n;
 
+#if CMK_SMP && !CMK_ENABLE_ASYNC_PROGRESS
+  // No comm thread for regular smp
+  Cmi_smp_mode_setting = COMM_THREAD_NOT_EXIST;
+#endif
+  // The default setting i.e COMM_THREAD_SEND_RECV, set in machine-common-core.c is used for async-smp
+
   //fprintf(stderr,"Creating %d pami contexts\n", _n);
 
   pami_configuration_t configuration;
diff --git a/src/arch/util/machine-common-core.c b/src/arch/util/machine-common-core.c
index a36cf913d2..0b23abff18 100644
--- a/src/arch/util/machine-common-core.c
+++ b/src/arch/util/machine-common-core.c
@@ -182,6 +182,7 @@ enum MACHINE_SMP_MODE {
 /* The default mode of smp charm runtime */
 static enum MACHINE_SMP_MODE Cmi_smp_mode_setting = COMM_THREAD_SEND_RECV;
 
+/* Machine layer dependent specific modes of the smp charm runtime are set in individual machine layers */
 
 #if CMK_SMP
 volatile int commThdExit = 0;
-- 
2.11.4.GIT