** 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.8 2001/02/26 17:36:56 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
}
-BackgroundSupervisor::BackgroundSupervisor (wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
- : m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_pDialogProgress(NULL), m_strProcessTitle(pszProcessTitle),
+BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
+ : m_pMyThread(pMyThread), 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++)
}
while (m_bBackgroundTaskAdded) {
- Sleep(50);
- ::wxYield();
+ m_pMyThread->Sleep(50);
+ ProcessPendingEvents();
}
delete m_pTimer;
}
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()
{
BackgroundSupervisor::OnCancel(wxCommandEvent& event)
{
m_bCancelled = true;
- deleteAnyWorkers();
m_bDone = true;
+ deleteWorkers();
}
void
{
m_iRunning--;
wxASSERT (m_iRunning >= 0);
- m_critsectThreadContainer.Enter();
- m_vecpThreads[event.GetInt()] = NULL;
- m_critsectThreadContainer.Leave();
#ifdef DEBUG
if (theApp->getVerboseLogging()) {
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);
}