** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: backgroundsupr.cpp,v 1.15 2001/03/05 20:29:23 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
#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"
#ifdef HAVE_WXTHREADS
-// #define USE_BKGMGR 1
+#define USE_BKGMGR 1
////////////////////////////////////////////////////////////////////////////
//
-BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
+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;
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;
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);
- }
- m_iRunning = 0;
+
m_bWorkersDeleted = true;
}
+void
+BackgroundSupervisor::ackRemoveBackgroundManager()
+{
+ m_bBackgroundManagerAdded = false;
+}
+
bool
BackgroundSupervisor::start()
{
#endif
m_pDocument->addBackgroundSupervisor (this);
-
+ m_bBackgroundManagerAdded = true;
+
m_iRunning = m_iNumThreads;
m_iUnitsDone = 0;
{
++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);
critsectDone.Enter();
m_iRunning--;
- wxASSERT (m_iRunning >= 0);
#ifdef DEBUG
if (theApp->getVerboseLogging()) {