X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fbackgroundsupr.cpp;h=7ec34080bed745d297c99197554e8a16497c4ad1;hb=fbe99ce7041eb409981b1fd8e269827daf4ed168;hp=04af1d6cb858a41681bfa77f1ecd53c184636fd9;hpb=c7435da167c4cec94d9f2da0410b5f544bb4c54d;p=ctsim.git diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp index 04af1d6..7ec3408 100644 --- a/src/backgroundsupr.cpp +++ b/src/backgroundsupr.cpp @@ -9,7 +9,7 @@ ** 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.14 2001/03/05 19:14:40 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 @@ -38,10 +38,9 @@ #include "backgroundsupr.h" #include "backgroundmgr.h" -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif +#ifdef HAVE_WXTHREADS +#define USE_BKGMGR 1 //////////////////////////////////////////////////////////////////////////// // @@ -51,30 +50,17 @@ 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), - wxEvtHandler() +BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* 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_iNumThreads = theApp->getNumberCPU(); - // ++m_iNumThreads; + // ++m_iNumThreads; m_vecpThreads.reserve (m_iNumThreads); for (int iThread = 0; iThread < m_iNumThreads; iThread++) @@ -84,30 +70,34 @@ BackgroundSupervisor::BackgroundSupervisor (wxFrame* pParentFrame, wxDocument* p 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; +} + +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) { - Sleep(50); - ProcessPendingEvents(); - } - - 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) { - Sleep(50); - ProcessPendingEvents(); + m_pMyThread->Sleep(50); } - - delete m_pTimer; - delete m_pDialogProgress; + m_iRunning = 0; + m_bWorkersDeleted = true; } bool @@ -115,8 +105,8 @@ 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; @@ -131,28 +121,27 @@ BackgroundSupervisor::start() 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(); + +#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); +#endif + + m_pDocument->addBackgroundSupervisor (this); m_iRunning = m_iNumThreads; m_iUnitsDone = 0; @@ -164,20 +153,15 @@ BackgroundSupervisor::start() } void -BackgroundSupervisor::OnCancel(wxCommandEvent& event) +BackgroundSupervisor::onCancel() { m_bCancelled = true; m_bDone = true; } -void -BackgroundSupervisor::OnAckDocumentRemove(wxCommandEvent& event) -{ - m_bBackgroundTaskAdded = false; -} void -BackgroundSupervisor::OnWorkerUnitTick (wxCommandEvent& event) +BackgroundSupervisor::onWorkerUnitTick () { ++m_iUnitsDone; @@ -186,22 +170,20 @@ BackgroundSupervisor::OnWorkerUnitTick (wxCommandEvent& event) *theApp->getLog() << "Units done: " << static_cast(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); - } +#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); @@ -214,19 +196,19 @@ BackgroundSupervisor::OnWorkerDone (wxCommandEvent& event) wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event } #endif - if (m_iRunning <= 0 && ! m_bCancelled) - 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