X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fthreadrecon.cpp;h=51b930d536ea416eb801d651989d767716051868;hp=159e9d43975749c2e1ad154c54203150e236238e;hb=df521cfe14a9e0b47bdcd98d1f67d03acf242162;hpb=b0df0a0f3008d0fee67f388cfa1c37af6383b38f diff --git a/src/threadrecon.cpp b/src/threadrecon.cpp index 159e9d4..51b930d 100644 --- a/src/threadrecon.cpp +++ b/src/threadrecon.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: threadrecon.cpp,v 1.5 2001/02/23 03:28:26 kevin Exp $ +** $Id: threadrecon.cpp,v 1.12 2001/02/25 10:52:55 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 @@ -37,139 +37,119 @@ #include "views.h" #include "threadrecon.h" #include "backgroundmgr.h" +#include "backgroundsupr.h" #if defined(HAVE_CONFIG_H) #include "config.h" #endif -IMPLEMENT_DYNAMIC_CLASS(ThreadedReconstructor, BackgroundTask) -BEGIN_EVENT_TABLE(ThreadedReconstructor, BackgroundTask) -EVT_MENU(RECONSTRUCTION_THREAD_EVENT, ThreadedReconstructor::OnThreadEvent) -END_EVENT_TABLE() +///////////////////////////////////////////////////////////////////// +// +// Class ReconstructorSupervisorThread -- Thread for Background Supervisor +// +///////////////////////////////////////////////////////////////////// -enum { - RTHREAD_UNIT_COMPLETE = -1, - RTHREAD_THREAD_DONE = -2, - RTHREAD_THREAD_CANCELLED = -3, -}; - -ThreadedReconstructor::ThreadedReconstructor (ProjectionFileView* pProjView, - int iImageNX, int iImageNY, const char* pszFilterName, double dFilterParam, const char* pszFilterMethod, - int iZeropad, const char* pszFilterGenerationName, const char* pszInterpName, int iInterpParam, - const char* pszBackprojectName, const char* const pszLabel) - : m_pProjView(pProjView), m_pDialogProgress(NULL), m_pGauge(NULL), m_bFail(false), m_iNumThreads(0), m_iImageNX(iImageNX), - m_iImageNY(iImageNY), m_strLabel(pszLabel), m_pTimer(NULL), m_bCancelled(false), m_bCancelling(false), - BackgroundTask() +ReconstructorSupervisorThread::ReconstructorSupervisorThread (ProjectionFileView* pProjView, int iNX, int iNY, + const char* pszFilterName, double dFilterParam, const char* pszFilterMethod, int iZeropad, + const char* pszFilterGenerationName, const char* pszInterpName, int iInterpParam, + const char* pszBackprojectName, const char* const pszLabel) +: m_pProjView(pProjView), m_iNX(iNX), m_iNY(iNY), m_strFilterName(pszFilterName), m_dFilterParam(dFilterParam), + m_strFilterMethod(pszFilterMethod), m_iZeropad(iZeropad), m_strFilterGenerationName(pszFilterGenerationName), + m_strInterpName(pszInterpName), m_iInterpParam(iInterpParam), m_strBackprojectName(pszBackprojectName), m_strLabel(pszLabel), + SupervisorThread() { - m_iNumThreads = theApp->getNumberCPU(); - // ++m_iNumThreads; - m_iTotalViews = m_pProjView->GetDocument()->getProjections().nView(); - int iBaseViews = m_iTotalViews / m_iNumThreads; - int iExtraViews = m_iTotalViews % m_iNumThreads; - - m_vecpChildImageFile.reserve (m_iNumThreads); - m_vecpThread.reserve (m_iNumThreads); - - for (unsigned int iProc = 0; iProc < m_iNumThreads; iProc++) { - m_vecpChildImageFile[iProc] = new ImageFile (iImageNX, iImageNY); - - int iStartView = iProc * iBaseViews; - int iNumViews = iBaseViews; - if (iProc < iExtraViews) - ++iNumViews; - m_vecpThread[iProc] = new ReconstructionThread (this, pProjView, m_vecpChildImageFile[iProc], iProc, iStartView, iNumViews, - pszFilterName, dFilterParam, pszFilterMethod, iZeropad, pszFilterGenerationName, pszInterpName, iInterpParam, pszBackprojectName); - if (m_vecpThread[iProc]->Create () != wxTHREAD_NO_ERROR) { - m_bFail = true; - break; - } - } - } - -bool -ThreadedReconstructor::start() +wxThread::ExitCode +ReconstructorSupervisorThread::Entry() { - if (m_bFail) - return false; - - m_pProjView->GetDocument()->addReconstructor (this); - if (! theApp->getUseBackgroundTasks()) - m_pDialogProgress = new wxProgressDialog (_T("Filtered Backprojection"), _T("Reconstruction Progress"), m_iTotalViews, m_pProjView->getFrame(), wxPD_CAN_ABORT | wxPD_AUTO_HIDE); - else { - std::string strLabel ("Reconstructing "); - strLabel += m_pProjView->GetFrame()->GetTitle(); - m_pGauge = theApp->getBackgroundManager()->addTask (this, m_iTotalViews, strLabel.c_str()); + ReconstructorSupervisor reconSupervisor (m_pProjView, m_iNX, m_iNY, + m_strFilterName.c_str(), m_dFilterParam, m_strFilterMethod.c_str(), m_iZeropad, m_strFilterGenerationName.c_str(), + m_strInterpName.c_str(), m_iInterpParam, m_strBackprojectName.c_str(), m_strLabel.c_str()); + + reconSupervisor.start(); + while (! reconSupervisor.isDone() && ! reconSupervisor.fail()) { + Sleep(50); + Yield(); } - - m_iRunning = m_iNumThreads; - m_iViewsDone = 0; - m_pTimer = new Timer; - - // starting all threads - for (int i = 0; i < m_iNumThreads; i++) - m_vecpThread[i]->Run(); - - if (m_bCancelled) - return false; - - return true; + if (reconSupervisor.fail()) + { + wxString msg ("Error starting reconstructor supervisor: "); + msg += reconSupervisor.getFailMessage().c_str(); + msg += "\n"; + wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + eventLog.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event + } + + while (! reconSupervisor.workersDeleted()) { + Sleep(50); + reconSupervisor.ProcessPendingEvents(); + } + + return reinterpret_cast(0); } void -ThreadedReconstructor::cancel() +ReconstructorSupervisorThread::OnExit() { - if (isDone() || m_bCancelled) - return; - m_bCancelled = true; - m_bCancelling = false; - cleanUp(); } -void -ThreadedReconstructor::cleanUp() + +///////////////////////////////////////////////////////////////////// +// +// Class ReconstructorSupervisor -- A Background Supervisor +// +///////////////////////////////////////////////////////////////////// + +ReconstructorSupervisor::ReconstructorSupervisor (ProjectionFileView* pProjView, + int iImageNX, int iImageNY, const char* pszFilterName, double dFilterParam, const char* pszFilterMethod, + int iZeropad, const char* pszFilterGenerationName, const char* pszInterpName, int iInterpParam, + const char* pszBackprojectName, const char* const pszLabel) + : m_pProjView(pProjView), m_pProjDoc(pProjView->GetDocument()), + m_iImageNX(iImageNX), m_iImageNY(iImageNY), + m_pszFilterName(pszFilterName), m_dFilterParam(dFilterParam), m_pszFilterMethod(pszFilterMethod), + m_iZeropad(iZeropad), m_pszFilterGenerationName(pszFilterGenerationName), m_pszInterpName(pszInterpName), + m_iInterpParam(iInterpParam), m_pszBackprojectName(pszBackprojectName), m_pszLabel(pszLabel), + BackgroundSupervisor (pProjView->GetFrame(), pProjView->GetDocument(), "Reconstructing", pProjView->GetDocument()->getProjections().nView()) { - wxCriticalSection cleanSection; - cleanSection.Enter(); - - for (int i = 0; i < m_iNumThreads; i++) - if (m_vecpThread[i] && m_vecpThread[i]->IsRunning()) { - m_vecpThread[i]->Pause(); - m_vecpThread[i]->Delete(); - } - - for (i = 0; i < m_iNumThreads; i++) { + m_vecpChildImageFile.reserve (getNumWorkers()); + for (unsigned int iThread = 0; iThread < getNumWorkers(); iThread++) { + m_vecpChildImageFile[iThread] = new ImageFile (iImageNX, iImageNY); + } + +} + +ReconstructorSupervisor::~ReconstructorSupervisor() +{ + for (int i = 0; i < getNumWorkers(); i++) { delete m_vecpChildImageFile[i]; m_vecpChildImageFile[i] = NULL; - } - - m_iNumThreads = 0; - m_iRunning = 0; - delete m_pDialogProgress; - delete m_pTimer; - m_pDialogProgress = NULL; - m_pGauge = NULL; - setDone(); - m_pProjView->GetDocument()->removeReconstructor (this); - theApp->getBackgroundManager()->taskDone (this); - - cleanSection.Leave(); + } +} + +BackgroundWorkerThread* +ReconstructorSupervisor::createWorker (int iThread, int iStartUnit, int iNumUnits) +{ + ReconstructorWorker* pThread = new ReconstructorWorker (this, iThread, iStartUnit, iNumUnits); + pThread->SetParameters (m_pProjView, m_vecpChildImageFile[iThread], m_pszFilterName, m_dFilterParam, + m_pszFilterMethod, m_iZeropad, m_pszFilterGenerationName, m_pszInterpName, + m_iInterpParam, m_pszBackprojectName); + + return pThread; } void -ThreadedReconstructor::onDone() +ReconstructorSupervisor::onDone() { wxCriticalSection doneSection; - doneSection.Enter(); - - m_pProjView->GetDocument()->removeReconstructor (this); + wxCriticalSectionLocker critsect (doneSection); + ImageFileDocument* pReconDoc = theApp->newImageDoc(); if (! pReconDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); - doneSection.Leave(); return; } @@ -183,74 +163,23 @@ ThreadedReconstructor::onDone() rasterView->getFrame()->SetFocus(); rasterView->getFrame()->Show(true); } - *theApp->getLog() << m_strLabel << "\n"; + *theApp->getLog() << m_pszLabel << "\n"; pImageFile->labelAdd (m_pProjView->GetDocument()->getProjections().getLabel()); - pImageFile->labelAdd (m_strLabel.c_str(), m_pTimer->timerEnd()); - - doneSection.Leave(); - cleanUp(); -} - + pImageFile->labelAdd (m_pszLabel, getTimerEnd()); -void -ThreadedReconstructor::OnThreadEvent (wxCommandEvent& event) -{ - if (isDone()) - return; - wxCriticalSection eventSection; - eventSection.Enter(); - if (isDone()) { - eventSection.Leave(); - return; - } - - int iEventId = event.GetInt(); - if (iEventId == RTHREAD_UNIT_COMPLETE) { - ++m_iViewsDone; - -#ifdef DEBUG - if (theApp->getVerboseLogging()) - *theApp->getLog() << "Views done: " << static_cast(m_iViewsDone) <<"\n"; -#endif - - if (m_pDialogProgress) - m_bCancelling = ! m_pDialogProgress->Update (m_iViewsDone - 1); - else if (m_pGauge) { - m_pGauge->SetValue (m_iViewsDone - 1); - eventSection.Leave(); - m_bCancelling = theApp->getBackgroundManager()->isCancelling(this); - } - if (! isDone() && m_bCancelling) { - eventSection.Leave(); - cancel(); - return; - } - } - else if (event.GetInt() >= 0) { - m_iRunning--; - m_vecpThread[event.GetInt()] = NULL; - *theApp->getLog() << "Thread finished. Remaining threads: " << m_iRunning << "\n"; - if (m_iRunning <= 0) { - eventSection.Leave(); - onDone(); - return; - } - } - else - *theApp->getLog() << "Got event #" << iEventId << "\n"; - - eventSection.Leave(); + setDone(); } + ImageFile* -ThreadedReconstructor::getImageFile() +ReconstructorSupervisor::getImageFile() { ImageFile* pImageFile = new ImageFile (m_iImageNX, m_iImageNY); pImageFile->arrayDataClear(); ImageFileArray pArray = pImageFile->getArray(); int i; - for (i = 0; i < m_iNumThreads; i++) { + for (i = 0; i < getNumWorkers(); i++) { ImageFileArrayConst pChildArray = m_vecpChildImageFile[i]->getArray(); for (int ix = 0; ix < m_iImageNX; ix++) for (int iy = 0; iy < m_iImageNY; iy++) @@ -260,60 +189,88 @@ ThreadedReconstructor::getImageFile() return (pImageFile); } -bool -ThreadedReconstructor::testDone() -{ - return (m_iRunning <= 0 ? true : false); -} - - -ThreadedReconstructor::~ThreadedReconstructor() -{ -} +///////////////////////////////////////////////////////////////////// +// +// Class ReconstructorWorker -- A worker thread +// +///////////////////////////////////////////////////////////////////// -ReconstructionThread::ReconstructionThread -(ThreadedReconstructor* pSupervisor, ProjectionFileView* pProjView, ImageFile* pImageFile, int iThread, int iStartView, int iNumViews, - const char* pszFilterName, double dFilterParam, const char* pszFilterMethod, - int iZeropad, const char* pszFilterGenerationName, const char* pszInterpName, int iInterpParam, - const char* pszBackprojectName) - : m_pSupervisor(pSupervisor), - m_iStartView(iStartView), m_iNumViews(iNumViews), m_iThread(iThread), - wxThread(wxTHREAD_DETACHED) +void +ReconstructorWorker::SetParameters (ProjectionFileView* pProjView, ImageFile* pImageFile, + const char* pszFilterName, double dFilterParam, const char* pszFilterMethod, int iZeropad, + const char* pszFilterGenerationName, const char* pszInterpName, int iInterpParam, + const char* pszBackprojectName) { - m_pReconstructor = new Reconstructor (pProjView->GetDocument()->getProjections(), - *pImageFile, pszFilterName, dFilterParam, pszFilterMethod, iZeropad, pszFilterGenerationName, - pszInterpName, iInterpParam, pszBackprojectName, Trace::TRACE_NONE); + m_pProjView = pProjView; + m_pImageFile = pImageFile; + m_pszFilterName = pszFilterName; + m_dFilterParam = dFilterParam; + m_pszFilterMethod = pszFilterMethod; + m_iZeropad = iZeropad; + m_pszFilterGenerationName = pszFilterGenerationName; + m_pszInterpName = pszInterpName; + m_iInterpParam = iInterpParam; + m_pszBackprojectName = pszBackprojectName; } wxThread::ExitCode -ReconstructionThread::Entry () +ReconstructorWorker::Entry () { - wxCommandEvent eventProgress (wxEVT_COMMAND_MENU_SELECTED, RECONSTRUCTION_THREAD_EVENT); + Reconstructor* pReconstructor = new Reconstructor (m_pProjView->GetDocument()->getProjections(), + *m_pImageFile, m_pszFilterName, m_dFilterParam, m_pszFilterMethod, m_iZeropad, + m_pszFilterGenerationName, m_pszInterpName, m_iInterpParam, m_pszBackprojectName, Trace::TRACE_NONE); - for (int iView = 0; iView < m_iNumViews; iView++) { - if (TestDestroy()) { - wxString msg; - msg.Printf("TestDestroy TRUE at view #%d\n", iView); + bool bFail = pReconstructor->fail(); + wxString failMsg; + if (bFail) { + failMsg = "Unable to make reconstructor: "; + failMsg += pReconstructor->failMessage().c_str(); wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); - event.SetString( msg ); - wxPostEvent( theApp->getMainFrame(), event ); // send in a thread-safe way - return reinterpret_cast(RTHREAD_THREAD_CANCELLED); + event.SetString( failMsg ); + wxPostEvent( theApp->getMainFrame(), event ); + } + else + { + wxCommandEvent eventProgress (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_UNIT_TICK); + for (int iUnit = 0; iUnit < m_iNumUnits; iUnit++) { + if (TestDestroy()) { +#ifdef DEBUG + if (theApp->getVerboseLogging()) { + wxString msg; + msg.Printf("Worker thread: Received destroy message at work unit #%d\n", iUnit); + wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + event.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), event ); + } +#endif + break; + } + pReconstructor->reconstructView (iUnit + m_iStartUnit, 1); + m_pSupervisor->AddPendingEvent (eventProgress); } - m_pReconstructor->reconstructView (iView + m_iStartView, 1); - eventProgress.SetInt (RTHREAD_UNIT_COMPLETE); - wxPostEvent (m_pSupervisor, eventProgress); + pReconstructor->postProcessing(); } - m_pReconstructor->postProcessing(); - - eventProgress.SetInt (m_iThread); // Send back thread# that has finished - wxPostEvent (m_pSupervisor, eventProgress); - + delete pReconstructor; + + if (bFail) { + wxCommandEvent eventFail (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_FAIL); + eventFail.SetInt (m_iThread); // Send back thread# that has finished + eventFail.SetString (failMsg); + wxPostEvent (m_pSupervisor, eventFail); + } else { + wxCommandEvent eventDone (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_DONE); + eventDone.SetInt (m_iThread); // Send back thread# that has finished + wxPostEvent (m_pSupervisor, eventDone); + } + + while (! TestDestroy()) + Sleep(100); + return reinterpret_cast(0); } void -ReconstructionThread::OnExit () +ReconstructorWorker::OnExit () { - delete m_pReconstructor; }