** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: backgroundsupr.cpp,v 1.3 2001/02/25 08:00:57 kevin Exp $
+** $Id: backgroundsupr.cpp,v 1.9 2001/02/27 03:59:30 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++)
BackgroundSupervisor::~BackgroundSupervisor()
{
- for (int i = 0; i < m_iNumThreads; i++)
- if (m_vecpThreads[i]) {
- m_vecpThreads[i]->Delete(); // sends Destroy message to workers
- }
-
- while (m_iRunning > 0) {
- Sleep(50);
- ProcessPendingEvents();
- }
-
if (m_bBackgroundTaskAdded) {
wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
doneEvent.SetClientData (this);
}
while (m_bBackgroundTaskAdded) {
- Sleep(50);
+ m_pMyThread->Sleep(50);
ProcessPendingEvents();
}
delete m_pDialogProgress;
}
+void
+BackgroundSupervisor::deleteWorkers()
+{
+ 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
+ }
+
+ while (m_iRunning > 0) {
+ m_pMyThread->Sleep(50);
+ ProcessPendingEvents();
+ }
+ m_iRunning = 0;
+ m_bWorkersDeleted = true;
+}
+
bool
BackgroundSupervisor::start()
{
int iBaseUnits = m_iTotalUnits / m_iNumThreads;
int iExtraUnits = m_iTotalUnits % m_iNumThreads;
+ int iStartUnit = 0;
for (int iThread = 0; iThread < m_iNumThreads; iThread++) {
- int iStartUnit = iThread * iBaseUnits;
int iNumUnits = iBaseUnits;
if (iThread < iExtraUnits)
++iNumUnits;
m_strFailMessage = "Thread creation failed [BackgroundSupervisor]";
break;
}
- m_vecpThreads[iThread]->SetPriority (40);
+ m_vecpThreads[iThread]->SetPriority (40);
+ iStartUnit += iNumUnits;
}
if (m_bFail)
return false;
{
m_bCancelled = true;
m_bDone = true;
+ deleteWorkers();
}
void
wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
}
#endif
- if (m_iRunning <= 0 && ! m_bCancelled)
+ if (m_iRunning <= 0 && ! m_bCancelled) {
+ deleteWorkers();
onDone();
+ }
}
void