Merge pull request #1229 from eisenhauer/SstRaceOnTimeoutClose2

Race Condition Adjust
ornladios · Feb 26, 2019 · 093e342 · 093e342
2 parents dac7c51 + 6c31525
commit 093e342
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/source/adios2/toolkit/sst/cp/cp_reader.c b/source/adios2/toolkit/sst/cp/cp_reader.c
@@ -1049,7 +1049,6 @@ extern SstStatusValue SstAdvanceStep(SstStream Stream, SstStepMode mode,
                 }
                 NextTimestep =
                     MaxQueuedMetadata(Stream); /* might be -1 if we timed out */
-                MPI_Bcast(&NextTimestep, 1, MPI_LONG, 0, Stream->mpiComm);
             }
             else
             {
@@ -1077,13 +1076,13 @@ extern SstStatusValue SstAdvanceStep(SstStream Stream, SstStepMode mode,
                                Smallest);
                     NextTimestep = Smallest;
                 }
-                if ((NextTimestep == -1) && (Stream->Status == PeerClosed))
-                {
-                    /* force everyone to close */
-                    NextTimestep = -2;
-                }
-                MPI_Bcast(&NextTimestep, 1, MPI_LONG, 0, Stream->mpiComm);
             }
+            if ((NextTimestep == -1) && (Stream->Status == PeerClosed))
+            {
+                /* force everyone to close */
+                NextTimestep = -2;
+            }
+            MPI_Bcast(&NextTimestep, 1, MPI_LONG, 0, Stream->mpiComm);
         }
         else
         {