Merge pull request #1995 from eisenhauer/AddDestroyedState

Add a Destroyed state to streams
ornladios · Mar 1, 2020 · ab2d2e4 · ab2d2e4
2 parents e41149c + c4b9b09
commit ab2d2e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/source/adios2/toolkit/sst/cp/cp_common.c b/source/adios2/toolkit/sst/cp/cp_common.c
@@ -998,7 +998,7 @@ extern void SstStreamDestroy(SstStream Stream)
     CP_verbose(Stream, "Destroying stream %p, name %s\n", Stream,
                Stream->Filename);
     pthread_mutex_lock(&Stream->DataLock);
-    Stream->Status = Closed;
+    Stream->Status = Destroyed;
     struct _TimestepMetadataList *Next = Stream->Timesteps;
     while (Next)
     {
@@ -1139,7 +1139,6 @@ extern void SstStreamDestroy(SstStream Stream)
         CP_verbose(
             Stream,
             "Reference count now zero, Destroying process SST info cache\n");
-        // wait .1 sec for last messages
         CManager_close(CPInfo->cm);
         if (CPInfo->ffs_c)
             free_FFSContext(CPInfo->ffs_c);

diff --git a/source/adios2/toolkit/sst/cp/cp_internal.h b/source/adios2/toolkit/sst/cp/cp_internal.h
@@ -55,7 +55,8 @@ enum StreamStatus
     Established,
     PeerClosed,
     PeerFailed,
-    Closed
+    Closed,
+    Destroyed
 };
 
 static char *SSTStreamStatusStr[] = {"NotOpen",    "Opening",    "Established",

diff --git a/source/adios2/toolkit/sst/cp/cp_reader.c b/source/adios2/toolkit/sst/cp/cp_reader.c
@@ -189,6 +189,8 @@ extern void ReaderConnCloseHandler(CManager cm, CMConnection ClosedConn,
     SstStream Stream = (SstStream)client_data;
     int FailedPeerRank = -1;
     CP_verbose(Stream, "Reader-side close handler invoked\n");
+    if (Stream->Status == Destroyed)
+        return;
     if (!Stream->ConnectionsToWriter)
         return;
     for (int i = 0; i < Stream->WriterCohortSize; i++)

diff --git a/testing/adios2/engine/staging-common/TestCommonReadAttrs.cpp b/testing/adios2/engine/staging-common/TestCommonReadAttrs.cpp
@@ -293,16 +293,18 @@ TEST_F(CommonReadTest, ADIOS2CommonRead1D8)
         TimeGapDetected++;
     }
 
-    if (TimeGapExpected)
+    if (!IgnoreTimeGap)
     {
-        EXPECT_TRUE(TimeGapDetected);
+        if (TimeGapExpected)
+        {
+            EXPECT_TRUE(TimeGapDetected);
+        }
+        else
+        {
+            EXPECT_FALSE(TimeGapDetected);
+        }
     }
-    else
-    {
-        EXPECT_EQ(t, NSteps);
 
-        EXPECT_FALSE(TimeGapDetected);
-    }
     // Close the file
     engine.Close();
 }