** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: backgroundsupr.cpp,v 1.7 2001/02/25 19:24:01 kevin Exp $
+** $Id: backgroundsupr.cpp,v 1.12 2001/03/04 22:30:19 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
#include "backgroundsupr.h"
#include "backgroundmgr.h"
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
+#ifdef HAVE_WXTHREADS
////////////////////////////////////////////////////////////////////////////
//
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 (wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
- : 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_bWorkersDeleted(false),
- wxEvtHandler()
+BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, wxDocument* 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_bBackgroundTaskAdded(false), m_bWorkersDeleted(false)
{
m_iNumThreads = theApp->getNumberCPU();
-// ++m_iNumThreads;
+ // ++m_iNumThreads;
m_vecpThreads.reserve (m_iNumThreads);
for (int iThread = 0; iThread < m_iNumThreads; iThread++)
while (m_bBackgroundTaskAdded) {
m_pMyThread->Sleep(50);
- ProcessPendingEvents();
}
delete m_pTimer;
- delete m_pDialogProgress;
}
void
while (m_iRunning > 0) {
m_pMyThread->Sleep(50);
- ProcessPendingEvents();
}
m_iRunning = 0;
m_bWorkersDeleted = true;
{
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_pTimer = new Timer;
- if (! theApp->getUseBackgroundTasks())
- m_pDialogProgress = new wxProgressDialog (_T("Filtered Backprojection"), _T("Reconstruction Progress"),
- m_iTotalUnits, m_pParentFrame, wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
- else {
- std::string strLabel (m_strProcessTitle);
- strLabel += " ";
- strLabel += m_pParentFrame->GetTitle();
- 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;
- }
+ std::string strLabel (m_strProcessTitle);
+ strLabel += " ";
+ strLabel += m_pParentFrame->GetTitle();
+ 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;
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)
+BackgroundSupervisor::onAckDocumentRemove()
{
m_bBackgroundTaskAdded = false;
}
+
void
-BackgroundSupervisor::OnWorkerUnitTick (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerUnitTick ()
{
++m_iUnitsDone;
*theApp->getLog() << "Units done: " << static_cast<int>(m_iUnitsDone) <<"\n";
#endif
- if (m_pDialogProgress) {
- if (! m_pDialogProgress->Update (m_iUnitsDone - 1)) {
- wxCommandEvent dummy;
- OnCancel (dummy);
- }
- } else {
- wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK);
- addTaskEvent.SetInt (m_iUnitsDone - 1);
- addTaskEvent.SetClientData (this);
- wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
- }
+ wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK);
+ addTaskEvent.SetInt (m_iUnitsDone - 1);
+ addTaskEvent.SetClientData (this);
+ wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
}
void
-BackgroundSupervisor::OnWorkerDone (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerDone (int iThread)
{
+ wxCriticalSection critsectDone;
+ critsectDone.Enter();
+
m_iRunning--;
wxASSERT (m_iRunning >= 0);
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