** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: backgroundsupr.cpp,v 1.10 2001/03/02 21:11:50 kevin Exp $
+** $Id: backgroundsupr.cpp,v 1.20 2002/10/24 20:09:55 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
#ifdef HAVE_WXTHREADS
+#define USE_BKGMGR 1
+
////////////////////////////////////////////////////////////////////////////
//
// Class BackgroundSupervisor -- An event handler run by a SupervisorThread
IMPLEMENT_DYNAMIC_CLASS(BackgroundSupervisor, wxEvtHandler)
BEGIN_EVENT_TABLE(BackgroundSupervisor, BackgroundSupervisor)
-EVT_MENU(MSG_BACKGROUND_SUPERVISOR_CANCEL, BackgroundSupervisor::OnCancel)
-EVT_MENU(MSG_WORKER_THREAD_FAIL, BackgroundSupervisor::OnWorkerFail)
-EVT_MENU(MSG_WORKER_THREAD_DONE, BackgroundSupervisor::OnWorkerDone)
-EVT_MENU(MSG_WORKER_THREAD_UNIT_TICK, BackgroundSupervisor::OnWorkerUnitTick)
-EVT_MENU(MSG_DOCUMENT_ACK_REMOVE, BackgroundSupervisor::OnAckDocumentRemove)
END_EVENT_TABLE()
-// Static function
-void
-BackgroundSupervisor::cancelSupervisor (BackgroundSupervisor* pSupervisor)
-{
- wxCommandEvent cancelEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_CANCEL);
- wxPostEvent (pSupervisor, cancelEvent);
-}
-BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
- : 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_pTimer(NULL), m_bBackgroundTaskAdded(false), m_bWorkersDeleted(false),
- wxEvtHandler()
+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_bBackgroundManagerAdded(false)
{
m_iNumThreads = theApp->getNumberCPU();
- ++m_iNumThreads;
+ // ++m_iNumThreads;
- m_vecpThreads.reserve (m_iNumThreads);
+ m_vecpThreads.resize (m_iNumThreads);
for (int iThread = 0; iThread < m_iNumThreads; iThread++)
m_vecpThreads[iThread] = NULL;
BackgroundSupervisor::~BackgroundSupervisor()
{
- if (m_bBackgroundTaskAdded) {
- wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
- doneEvent.SetClientData (this);
- wxPostEvent (theApp->getBackgroundManager(), doneEvent);
- wxPostEvent (m_pDocument, doneEvent);
- }
-
- while (m_bBackgroundTaskAdded) {
- m_pMyThread->Sleep(50);
- ProcessPendingEvents();
- }
+ m_pDocument->removeBackgroundSupervisor (this);
delete m_pTimer;
}
return;
for (int i = 0; i < m_iNumThreads; i++)
- if (m_vecpThreads[i]) {
- m_vecpThreads[i]->Delete(); // sends Destroy message to workers
- }
+ 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);
- ProcessPendingEvents();
- }
- m_iRunning = 0;
+
m_bWorkersDeleted = true;
}
+void
+BackgroundSupervisor::ackRemoveBackgroundManager()
+{
+ m_bBackgroundManagerAdded = false;
+}
+
bool
BackgroundSupervisor::start()
{
std::string strLabel (m_strProcessTitle);
strLabel += " ";
strLabel += m_pParentFrame->GetTitle();
+
+#ifdef USE_BKGMGR
wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_ADD);
addTaskEvent.SetString (strLabel.c_str());
addTaskEvent.SetInt (m_iTotalUnits);
addTaskEvent.SetClientData (this);
wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
- wxPostEvent (m_pDocument, addTaskEvent);
- m_bBackgroundTaskAdded = true;
-
+#endif
+
+ m_pDocument->addBackgroundSupervisor (this);
+ m_bBackgroundManagerAdded = true;
+
m_iRunning = m_iNumThreads;
m_iUnitsDone = 0;
}
void
-BackgroundSupervisor::OnCancel(wxCommandEvent& event)
+BackgroundSupervisor::onCancel()
{
m_bCancelled = true;
m_bDone = true;
- deleteWorkers();
}
-void
-BackgroundSupervisor::OnAckDocumentRemove(wxCommandEvent& event)
-{
- m_bBackgroundTaskAdded = false;
-}
void
-BackgroundSupervisor::OnWorkerUnitTick (wxCommandEvent& event)
+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 (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerDone (int iThread)
{
+ wxCriticalSection critsectDone;
+ critsectDone.Enter();
+
m_iRunning--;
- wxASSERT (m_iRunning >= 0);
#ifdef DEBUG
if (theApp->getVerboseLogging()) {
wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
}
#endif
- if (m_iRunning <= 0 && ! m_bCancelled) {
- deleteWorkers();
- onDone();
- }
+
+ critsectDone.Leave();
}
void
-BackgroundSupervisor::OnWorkerFail (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerFail (int iThread, std::string strFailMessage)
{
m_iRunning--;
wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
- eventLog.SetString( event.GetString() );
+ eventLog.SetString( strFailMessage.c_str() );
wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
- wxCommandEvent dummy;
- OnCancel(dummy);
+ onCancel();
}
#endif // HAVE_WXTHREADS