fixup! mpi_dp: add support for same proc communication

ornladios · Mar 22, 2022 · 306a2e0 · 306a2e0
1 parent f55aa57
commit 306a2e0
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 181 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,7 +96,7 @@ endif()
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 if(NOT MSVC)
-  set(CMAKE_C_STANDARD 99)
+  set(CMAKE_C_STANDARD 11)
   set(CMAKE_C_STANDARD_REQUIRED True)
 endif()
 
@@ -116,9 +116,9 @@ else()
   set(ADIOS2_CXX11_FEATURES cxx_std_11)
 endif()
 if(CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel|Clang|AppleClang|MSVC)$")
-  set(ADIOS2_C99_FEATURES c_restrict)
+  set(ADIOS2_C11_FEATURES c_restrict)
 else()
-  set(ADIOS2_C99_FEATURES c_std_99)
+  set(ADIOS2_C11_FEATURES c_std_99)
 endif()
 
 include(CMakeDependentOption)

diff --git a/source/adios2/toolkit/sst/CMakeLists.txt b/source/adios2/toolkit/sst/CMakeLists.txt
@@ -5,7 +5,6 @@
 add_library(sst OBJECT
   dp/dp.c
   dp/dummy_dp.c
-  dp/mpi_dp.c
   dp/evpath_dp.c
   cp/cp_reader.c
   cp/cp_writer.c

diff --git a/source/adios2/toolkit/sst/cp/cp_writer.c b/source/adios2/toolkit/sst/cp/cp_writer.c
@@ -1119,11 +1119,6 @@ static void DerefAllSentTimesteps(SstStream Stream, WS_ReaderInfo Reader)
         List = Next;
     }
     CP_verbose(Stream, PerRankVerbose, "DONE DEREFERENCING\n");
-    if (Reader->DP_WSR_Stream)
-    {
-      Stream->DP_Interface->destroyWriterPerReader(&Svcs, Reader->DP_WSR_Stream);
-      Reader->DP_WSR_Stream = NULL;
-    }
 }
 
 static void SendTimestepEntryToSingleReader(SstStream Stream,
@@ -1475,6 +1470,14 @@ static void CP_PeerFailCloseWSReader(WS_ReaderInfo CP_WSR_Stream,
                 CP_WSR_Stream->Connections[i].CMconn = NULL;
             }
         }
+
+        if (CP_WSR_Stream->DP_WSR_Stream)
+        {
+            CP_WSR_Stream->ParentStream->DP_Interface->destroyWriterPerReader(
+                &Svcs, CP_WSR_Stream->DP_WSR_Stream);
+            CP_WSR_Stream->DP_WSR_Stream = NULL;
+        }
+
         if (NewState == PeerFailed)
         {
             // move to fully closed state later