Try to kill OnDemand Race, v2

Author: eisenhauer

source/adios2/toolkit/sst/cp/cp_writer.c

@@ -2531,6 +2531,11 @@ void CP_ReaderRequestStepHandler(CManager cm, CMConnection conn, void *Msg_v, vo
 
     STREAM_MUTEX_LOCK(CP_WSR_Stream->ParentStream);
     CPTimestepList List = Stream->QueuedTimesteps;
+    if (Stream->CloseMessagesSent)
+    {
+        CP_verbose(Stream, TraceVerbose, "In RequestStepHandler, stream closing, ignore\n");
+        STREAM_MUTEX_UNLOCK(CP_WSR_Stream->ParentStream);
+    }
     int RequestingReader = -1;
     for (int i = 0; i < Stream->ReaderCount; i++)
     {
@@ -2539,6 +2544,13 @@ void CP_ReaderRequestStepHandler(CManager cm, CMConnection conn, void *Msg_v, vo
             RequestingReader = i;
         }
     }
+    if (RequestingReader == -1)
+    {
+        CP_verbose(Stream, TraceVerbose,
+                   "In RequestStepHandler, RequestingReader not found, ignore\n");
+        STREAM_MUTEX_UNLOCK(CP_WSR_Stream->ParentStream);
+    }
+
     while (List)
     {
         size_t NextTS = Stream->LastDemandTimestep + 1;
@@ -2581,12 +2593,6 @@ void CP_ReaderRequestStepHandler(CManager cm, CMConnection conn, void *Msg_v, vo
     }
 
     CP_verbose(Stream, TraceVerbose, "In RequestStepHandler, queueing request\n");
-    assert(RequestingReader != -1);
-    if (Stream->CloseMessagesSent)
-    {
-        CP_verbose(Stream, TraceVerbose, "In RequestStepHandler, stream closing, ignore\n");
-        STREAM_MUTEX_UNLOCK(CP_WSR_Stream->ParentStream);
-    }
     StepRequest Request = calloc(sizeof(*Request), 1);
     Request->RequestingReader = RequestingReader;
     if (!Stream->StepRequestQueue)