Merge pull request #998 from eisenhauer/NetworkInterfaceEngineParameter

Add a NetworkInterface engine parameter
ornladios · Nov 11, 2018 · 3a1f142 · 3a1f142
2 parents 24274c6 + 5e3017d
commit 3a1f142
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/source/adios2/toolkit/sst/cp/cp_common.c b/source/adios2/toolkit/sst/cp/cp_common.c
@@ -586,6 +586,7 @@ void **CP_consolidateDataToAll(SstStream Stream, void *LocalInfo,
 }
 
 atom_t CM_TRANSPORT_ATOM = 0;
+static atom_t IP_INTERFACE_ATOM = 0;
 static atom_t CM_ENET_CONN_TIMEOUT = -1;
 
 static void initAtomList()
@@ -594,6 +595,7 @@ static void initAtomList()
         return;
 
     CM_TRANSPORT_ATOM = attr_atom_from_string("CM_TRANSPORT");
+    IP_INTERFACE_ATOM = attr_atom_from_string("IP_INTERFACE");
     CM_ENET_CONN_TIMEOUT = attr_atom_from_string("CM_ENET_CONN_TIMEOUT");
 }
 
@@ -837,6 +839,11 @@ extern char *CP_GetContactString(SstStream Stream)
     attr_list ListenList = create_attr_list(), ContactList;
     set_string_attr(ListenList, CM_TRANSPORT_ATOM,
                     strdup(Stream->ConfigParams->ControlTransport));
+    if (Stream->ConfigParams->NetworkInterface)
+    {
+        set_string_attr(ListenList, IP_INTERFACE_ATOM,
+                        strdup(Stream->ConfigParams->NetworkInterface));
+    }
     ContactList = CMget_specific_contact_list(Stream->CPInfo->cm, ListenList);
     if (strcmp(Stream->ConfigParams->ControlTransport, "enet") == 0)
     {

diff --git a/source/adios2/toolkit/sst/sst_data.h b/source/adios2/toolkit/sst/sst_data.h
@@ -33,6 +33,7 @@ struct _SstBlock
     MACRO(QueueFullPolicy, QueueFullPolicy, size_t, 0)                         \
     MACRO(IsRowMajor, IsRowMajor, int, 0)                                      \
     MACRO(ControlTransport, String, char *, NULL)                              \
+    MACRO(NetworkInterface, String, char *, NULL)                              \
     MACRO(CompressionMethod, CompressionMethod, size_t, 0)
 
 typedef enum {