r11859: Canonicalize whitespace

[ctsim.git] / src / backgroundsupr.cpp

diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp
index 18dde621d4dc40c94643e3f33681d88a67d2ddf4..d7d8c0a9a14cedfd203f2df8a39878bf66f1478a 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.17 2001/03/09 02:40:17 kevin Exp $
+**  $Id$
 **
 **  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
@@ -31,6 +31,9 @@
 #include "wx/wx.h"
 #endif
 
+// pragma line required for Fedora 4 and wxWin 2.4.2
+#pragma implementation "timer.h"
+
 #include "ct.h"
 #include "ctsim.h"
 #include "docs.h"
@@ -54,15 +57,15 @@ END_EVENT_TABLE()
 
 
 
-BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
-    : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle), 
+BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxWindow* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
+    : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle),
     m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), m_iRunning(0),
-    m_pTimer(NULL), m_bWorkersDeleted(false)
+    m_pTimer(NULL), m_bWorkersDeleted(false), m_bBackgroundManagerAdded(false)
 {
   m_iNumThreads = theApp->getNumberCPU();
   //   ++m_iNumThreads;
 
-  m_vecpThreads.reserve (m_iNumThreads);
+  m_vecpThreads.resize (m_iNumThreads);
   for (int iThread = 0; iThread < m_iNumThreads; iThread++)
     m_vecpThreads[iThread] = NULL;
 
@@ -70,12 +73,6 @@ BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame
 
 BackgroundSupervisor::~BackgroundSupervisor()
 {
-#ifdef USE_BKGMGR
-  wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
-  doneEvent.SetClientData (this);
-  wxPostEvent (theApp->getBackgroundManager(), doneEvent);
-#endif
-
   m_pDocument->removeBackgroundSupervisor (this);
 
   delete m_pTimer;
@@ -88,16 +85,28 @@ BackgroundSupervisor::deleteWorkers()
   if (m_bWorkersDeleted)
     return;
 
-  for (int i = 0; i < m_iNumThreads; i++) 
-    if (m_vecpThreads[i]) 
+  for (int i = 0; i < m_iNumThreads; i++)
+    if (m_vecpThreads[i])
       m_vecpThreads[i]->Delete(); // send Destroy message to workers
 
-  while (m_iRunning > 0) 
+#ifdef USE_BKGMGR
+  wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
+  doneEvent.SetClientData (this);
+  wxPostEvent (theApp->getBackgroundManager(), doneEvent);
+#endif
+
+  while (m_iRunning > 0 || m_bBackgroundManagerAdded)
     m_pMyThread->Sleep(50);
-  
+
   m_bWorkersDeleted = true;
 }
 
+void
+BackgroundSupervisor::ackRemoveBackgroundManager()
+{
+  m_bBackgroundManagerAdded = false;
+}
+
 bool
 BackgroundSupervisor::start()
 {
@@ -126,7 +135,7 @@ BackgroundSupervisor::start()
     return false;
 
   m_pTimer = new Timer;
-  
+
   std::string strLabel (m_strProcessTitle);
   strLabel += " ";
   strLabel += m_pParentFrame->GetTitle();
@@ -140,13 +149,14 @@ BackgroundSupervisor::start()
 #endif
 
   m_pDocument->addBackgroundSupervisor (this);
-  
+  m_bBackgroundManagerAdded = true;
+
   m_iRunning = m_iNumThreads;
   m_iUnitsDone = 0;
 
   for (int i = 0; i < m_iNumThreads; i++)
     m_vecpThreads[i]->Run();
-    
+
   return true;
 }
 
@@ -162,7 +172,7 @@ void
 BackgroundSupervisor::onWorkerUnitTick ()
 {
     ++m_iUnitsDone;
-    
+
 #ifdef USE_BKGMGR
     wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK);
     addTaskEvent.SetInt (m_iUnitsDone - 1);
@@ -174,15 +184,15 @@ BackgroundSupervisor::onWorkerUnitTick ()
 void
 BackgroundSupervisor::onWorkerDone (int iThread)
 {
-       wxCriticalSection critsectDone;
-       critsectDone.Enter();
+        wxCriticalSection critsectDone;
+        critsectDone.Enter();
 
   m_iRunning--;
 
 #ifdef DEBUG
   if (theApp->getVerboseLogging()) {
     wxString msg;
-    msg.Printf("Background Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning);  
+    msg.Printf("Background Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning);
     wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
     eventLog.SetString( msg );
     wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event