Merge pull request #1149 from eisenhauer/SSTDataTransportSpecFix

Fix canonicalization of preferred Data Transport
ornladios · Feb 8, 2019 · c28229c · c28229c
2 parents 403fe7f + 0ce3e57
commit c28229c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/source/adios2/toolkit/sst/cp/cp_common.c b/source/adios2/toolkit/sst/cp/cp_common.c
@@ -57,13 +57,13 @@ void CP_validateParams(SstStream Stream, SstParams Params, int Writer)
         if ((strcmp(SelectedTransport, "wan") == 0) ||
             (strcmp(SelectedTransport, "evpath") == 0))
         {
-            Stream->DataTransport = strdup("evpath");
+            Params->DataTransport = strdup("evpath");
         }
         else if ((strcmp(SelectedTransport, "rdma") == 0) ||
                  (strcmp(SelectedTransport, "ib") == 0) ||
                  (strcmp(SelectedTransport, "fabric") == 0))
         {
-            Stream->DataTransport = strdup("rdma");
+            Params->DataTransport = strdup("rdma");
         }
         free(SelectedTransport);
     }
@@ -809,7 +809,6 @@ extern void SstStreamDestroy(SstStream Stream)
         free(Stream->Readers);
     }
 
-    free(Stream->DataTransport);
     FFSFormatList FFSList = Stream->PreviousFormats;
     while (FFSList)
     {

diff --git a/source/adios2/toolkit/sst/cp/cp_internal.h b/source/adios2/toolkit/sst/cp/cp_internal.h
@@ -105,7 +105,6 @@ struct _SstStream
 
     /* params */
     int RendezvousReaderCount;
-    char *DataTransport;
     SstRegistrationMethod RegistrationMethod;
 
     /* state */

diff --git a/source/adios2/toolkit/sst/cp/cp_writer.c b/source/adios2/toolkit/sst/cp/cp_writer.c
@@ -795,7 +795,7 @@ SstStream SstWriterOpen(const char *Name, SstParams Params, MPI_Comm comm)
     if (!Stream->DP_Interface)
     {
         CP_verbose(Stream, "Failed to load DataPlane %s for Stream \"%s\"\n",
-                   Stream->DataTransport, Filename);
+                   Params->DataTransport, Filename);
         return NULL;
     }