r586: *** empty log message ***

[ctsim.git] / src / backgroundsupr.cpp

diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp
index c0326d68522968d0bcc21453823053a7c8b6c57b..4083c8220f8647253b19f44aa124c2bd8eae9bb3 100644 (file)
--- a/src/backgroundsupr.cpp
+++ b/src/backgroundsupr.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backgroundsupr.cpp,v 1.1 2001/02/25 06:32:12 kevin Exp $
+**  $Id: backgroundsupr.cpp,v 1.7 2001/02/25 19:24:01 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -70,11 +70,11 @@ BackgroundSupervisor::cancelSupervisor (BackgroundSupervisor* pSupervisor)
 BackgroundSupervisor::BackgroundSupervisor (wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
     : m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_pDialogProgress(NULL), m_strProcessTitle(pszProcessTitle), 
     m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), 
-    m_pTimer(NULL), m_bBackgroundTaskAdded(false),
+    m_pTimer(NULL), m_bBackgroundTaskAdded(false), m_bWorkersDeleted(false),
     wxEvtHandler()
 {
   m_iNumThreads = theApp->getNumberCPU();
-  //  ++m_iNumThreads;
+//    ++m_iNumThreads;
 
   m_vecpThreads.reserve (m_iNumThreads);
   for (int iThread = 0; iThread < m_iNumThreads; iThread++)
@@ -92,8 +92,8 @@ BackgroundSupervisor::~BackgroundSupervisor()
   }
 
   while (m_bBackgroundTaskAdded) {
-    Sleep(50);
-    ::wxYield();
+    m_pMyThread->Sleep(50);
+    ProcessPendingEvents();
   }
 
   delete m_pTimer;
@@ -101,22 +101,25 @@ BackgroundSupervisor::~BackgroundSupervisor()
 }
 
 void
-BackgroundSupervisor::deleteAnyWorkers()
+BackgroundSupervisor::deleteWorkers()
 {
-  m_critsectThreadContainer.Enter();  
+  wxCriticalSectionLocker lock (m_critsectThreads);
+  if (m_bWorkersDeleted)
+    return;
+
   for (int i = 0; i < m_iNumThreads; i++) 
     if (m_vecpThreads[i]) {
       m_vecpThreads[i]->Delete(); // sends Destroy message to workers
   }
-  m_critsectThreadContainer.Leave();
 
   while (m_iRunning > 0) {
-    Sleep(50);
-    ::wxYield();
+    m_pMyThread->Sleep(50);
+    ProcessPendingEvents();
   }
+  m_iRunning = 0;
+  m_bWorkersDeleted = true;
 }
 
-
 bool
 BackgroundSupervisor::start()
 {
@@ -174,8 +177,8 @@ void
 BackgroundSupervisor::OnCancel(wxCommandEvent& event)
 {
   m_bCancelled = true;
-  deleteAnyWorkers();
   m_bDone = true;
+  deleteWorkers();
 }
 
 void
@@ -212,9 +215,6 @@ BackgroundSupervisor::OnWorkerDone (wxCommandEvent& event)
 {
   m_iRunning--;
   wxASSERT (m_iRunning >= 0);
-  m_critsectThreadContainer.Enter();
-  m_vecpThreads[event.GetInt()] = NULL;
-  m_critsectThreadContainer.Leave();
 
 #ifdef DEBUG
   if (theApp->getVerboseLogging()) {
@@ -225,21 +225,21 @@ BackgroundSupervisor::OnWorkerDone (wxCommandEvent& event)
     wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
   }
 #endif
-  if (m_iRunning <= 0 && ! m_bCancelled)
+  if (m_iRunning <= 0 && ! m_bCancelled) {
+    deleteWorkers();
     onDone();
+  }
 }
 
 void
 BackgroundSupervisor::OnWorkerFail (wxCommandEvent& event)
 {
   m_iRunning--;
-  m_critsectThreadContainer.Enter();
-  m_vecpThreads[event.GetInt()] = NULL;
-  m_critsectThreadContainer.Leave();
   wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
   eventLog.SetString( event.GetString() );
   wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
 
-  onDone();
+  wxCommandEvent dummy;
+  OnCancel(dummy);
 }