X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fbackgroundsupr.cpp;h=c4720770bdc310051a4cd6da8fa4e212881d5d2a;hp=561009c8b97a368ae41aaf2eb3eeb79abab415f5;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=d77c9d135405e077047ef3426a54470c144cdd34

diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp
index 561009c..c472077 100644
--- 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.13 2001/03/05 17:26:46 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"
@@ -40,6 +43,8 @@
 
 #ifdef HAVE_WXTHREADS
 
+#define USE_BKGMGR 1
+
 ////////////////////////////////////////////////////////////////////////////
 //
 // Class BackgroundSupervisor -- An event handler run by a SupervisorThread
@@ -52,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, wxChar 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;
 
@@ -68,10 +73,6 @@ BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame
 
 BackgroundSupervisor::~BackgroundSupervisor()
 {
-  wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
-  doneEvent.SetClientData (this);
-  wxPostEvent (theApp->getBackgroundManager(), doneEvent);
-
   m_pDocument->removeBackgroundSupervisor (this);
 
   delete m_pTimer;
@@ -84,18 +85,28 @@ BackgroundSupervisor::deleteWorkers()
   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
-  }
+  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_iRunning = 0;
+
   m_bWorkersDeleted = true;
 }
 
+void
+BackgroundSupervisor::ackRemoveBackgroundManager()
+{
+  m_bBackgroundManagerAdded = false;
+}
+
 bool
 BackgroundSupervisor::start()
 {
@@ -109,12 +120,12 @@ BackgroundSupervisor::start()
     m_vecpThreads[iThread] = createWorker (iThread, iStartUnit, iNumUnits);
     if (! m_vecpThreads[iThread]) {
       m_bFail = true;
-      m_strFailMessage = "createWorker returned NULL [BackgroundSupervisor]";
+      m_strFailMessage = _T("createWorker returned NULL [BackgroundSupervisor]");
       break;
     }
     if (m_vecpThreads[iThread]->Create () != wxTHREAD_NO_ERROR) {
       m_bFail = true;
-      m_strFailMessage = "Thread creation failed [BackgroundSupervisor]";
+      m_strFailMessage = _T("Thread creation failed [BackgroundSupervisor]");
       break;
     }
    m_vecpThreads[iThread]->SetPriority (40);
@@ -124,24 +135,28 @@ BackgroundSupervisor::start()
     return false;
 
   m_pTimer = new Timer;
-  
-  std::string strLabel (m_strProcessTitle);
-  strLabel += " ";
-  strLabel += m_pParentFrame->GetTitle();
+
+  wxString strLabel (m_strProcessTitle);
+  strLabel += _T(" ");
+  strLabel += dynamic_cast<wxFrame*>(m_pParentFrame)->GetTitle();
+
+#ifdef USE_BKGMGR
   wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_ADD);
-  addTaskEvent.SetString (strLabel.c_str());
+  addTaskEvent.SetString (strLabel);
   addTaskEvent.SetInt (m_iTotalUnits);
   addTaskEvent.SetClientData (this);
   wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
+#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;
 }
 
@@ -157,31 +172,27 @@ void
 BackgroundSupervisor::onWorkerUnitTick ()
 {
     ++m_iUnitsDone;
-    
-#ifdef DEBUG
-    if (theApp->getVerboseLogging())
-      *theApp->getLog() << "Units done: " << static_cast<int>(m_iUnitsDone) <<"\n";
-#endif
-    
+
+#ifdef USE_BKGMGR
     wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK);
     addTaskEvent.SetInt (m_iUnitsDone - 1);
     addTaskEvent.SetClientData (this);
     wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
+#endif
 }
 
 void
 BackgroundSupervisor::onWorkerDone (int iThread)
 {
-	wxCriticalSection critsectDone;
-	critsectDone.Enter();
+        wxCriticalSection critsectDone;
+        critsectDone.Enter();
 
   m_iRunning--;
-  wxASSERT (m_iRunning >= 0);
 
 #ifdef DEBUG
   if (theApp->getVerboseLogging()) {
     wxString msg;
-    msg.Printf("Background Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning);  
+    msg.Printf(_T("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
@@ -192,11 +203,11 @@ BackgroundSupervisor::onWorkerDone (int iThread)
 }
 
 void
-BackgroundSupervisor::onWorkerFail (int iThread, std::string strFailMessage)
+BackgroundSupervisor::onWorkerFail (int iThread, const wxString& strFailMessage)
 {
   m_iRunning--;
   wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
-  eventLog.SetString( strFailMessage.c_str() );
+  eventLog.SetString( strFailMessage );
   wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
 
   onCancel();