save

ryoqun · Nov 30, 2023 · b006e9e · b006e9e
1 parent 97e108e
commit b006e9e
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/scheduler-pool/src/lib.rs b/scheduler-pool/src/lib.rs
@@ -783,24 +783,29 @@ where
                     }
 
                     if end_session {
-                        // or should also consider end_thread?
                         log_scheduler!("S:ended");
                         (state_machine, log_interval) =
                             (SchedulingStateMachine::new(), <_>::default());
                         drop_sender.send(SessionedMessage::EndSession).unwrap();
                         result_sender.send(drop_receiver2.recv().unwrap()).unwrap();
-                        end_session = false;
+                        if !end_thread {
+                            end_session = false;
+                        }
                     }
                 }
-                log_scheduler!("T:ended");
 
-                drop_sender.send(SessionedMessage::EndSession).unwrap();
-                let result_with_timings = drop_receiver2.recv().unwrap();
-                trace!(
-                    "solScheduler thread is ended at: {:?}",
-                    std::thread::current()
-                );
-                result_with_timings
+                log_scheduler!("T:ended");
+                if end_session {
+                    (Ok(()), ExecuteTimings::default())
+                } else {
+                    drop_sender.send(SessionedMessage::EndSession).unwrap();
+                    let result_with_timings = drop_receiver2.recv().unwrap();
+                    trace!(
+                        "solScheduler thread is ended at: {:?}",
+                        std::thread::current()
+                    );
+                    result_with_timings
+                }
             }
         };