X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fthreadrecon.cpp;h=03d4d39d37987dd4bbc18277f0c2d6f07b65d614;hb=1ef49f39828474ed05fe69aff68d400e3b7d4044;hp=aa9a7bb9cdbfa419f0b5cf372c4999757dc5f2d5;hpb=0730f9f3adbf326b9d4bac754634399ad688efd1;p=ctsim.git diff --git a/src/threadrecon.cpp b/src/threadrecon.cpp index aa9a7bb..03d4d39 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.1 2001/02/22 11:05:38 kevin Exp $ +** $Id: threadrecon.cpp,v 1.6 2001/02/23 18:56:56 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 @@ -36,195 +36,239 @@ #include "docs.h" #include "views.h" #include "threadrecon.h" +#include "backgroundmgr.h" #if defined(HAVE_CONFIG_H) #include "config.h" #endif -IMPLEMENT_DYNAMIC_CLASS(ThreadedReconstructor, wxEvtHandler) -BEGIN_EVENT_TABLE(ThreadedReconstructor, wxEvtHandler) -EVT_MENU(RECONSTRUCTION_THREAD_EVENT, ThreadedReconstructor::OnThreadEvent) +IMPLEMENT_DYNAMIC_CLASS(ReconstructorSupervisor, BackgroundSupervisor) +BEGIN_EVENT_TABLE(ReconstructorSupervisor, BackgroundSupervisor) +EVT_MENU(RECONSTRUCTION_THREAD_EVENT, ReconstructorSupervisor::OnThreadEvent) +EVT_MENU(MSG_WORKER_THREAD_FAIL, ReconstructorSupervisor::OnWorkerFail) +EVT_MENU(MSG_WORKER_THREAD_DONE, ReconstructorSupervisor::OnWorkerDone) +EVT_MENU(MSG_WORKER_THREAD_UNIT_TICK, ReconstructorSupervisor::OnWorkerUnitTick) END_EVENT_TABLE() -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_bFail(false), m_iNumThreads(0), m_iImageNX(iImageNX), - m_iImageNY(iImageNY), m_strLabel(pszLabel), m_pTimer(NULL), m_bCancelled(false), m_bCancelling(false), - m_bDone(false), wxEvtHandler() +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_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), + BackgroundSupervisor() { m_iNumThreads = theApp->getNumberCPU(); -// ++m_iNumThreads; + // ++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_vecpReconstructor.reserve (m_iNumThreads); m_vecpThread.reserve (m_iNumThreads); - + for (unsigned int iProc = 0; iProc < m_iNumThreads; iProc++) { m_vecpChildImageFile[iProc] = new ImageFile (iImageNX, iImageNY); - m_vecpReconstructor[iProc] = new Reconstructor (m_pProjView->GetDocument()->getProjections(), *m_vecpChildImageFile[iProc], - pszFilterName, dFilterParam, pszFilterMethod, iZeropad, pszFilterGenerationName, - pszInterpName, iInterpParam, pszBackprojectName, Trace::TRACE_NONE); - + int iStartView = iProc * iBaseViews; int iNumViews = iBaseViews; if (iProc < iExtraViews) ++iNumViews; - m_vecpThread[iProc] = new ReconstructionThread (this, m_vecpReconstructor[iProc], iProc, iStartView, iNumViews); + m_vecpThread[iProc] = new ReconstructorWorker (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; } } - - m_pProjView->GetDocument()->addReconstructor (this); - // m_pDialogProgress = new wxProgressDialog (_T("Filtered Backprojection"), _T("Reconstruction Progress"), m_iTotalViews, pProjView->getFrame(), wxPD_CAN_ABORT | wxPD_AUTO_HIDE); + } bool -ThreadedReconstructor::start() +ReconstructorSupervisor::start() { if (m_bFail) return false; - - // starting all threads + + 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()); + } + m_iRunning = m_iNumThreads; m_iViewsDone = 0; m_pTimer = new Timer; -// theApp->addBackgroundTask (this, m_iTotalViews); - - int i; - for (i = 0; i < m_iNumThreads; i++) + + // starting all threads + for (int i = 0; i < m_iNumThreads; i++) m_vecpThread[i]->Run(); - - + if (m_bCancelled) return false; - + return true; } void -ThreadedReconstructor::cancel() +ReconstructorSupervisor::cancel() { - if (m_bCancelled) + if (isDone() || m_bCancelled) return; - - wxCriticalSectionLocker locker (m_criticalSection); - - for (int i = 0; i < m_iNumThreads; i++) - if (m_vecpThread[i]) - m_vecpThread[i]->Delete(); - - for (i = 0; i < m_iNumThreads; i++) - delete m_vecpReconstructor[i]; - - m_iNumThreads = 0; - m_iRunning = 0; - delete m_pDialogProgress; - delete m_pTimer; - m_pDialogProgress = NULL; - m_pProjView->GetDocument()->removeReconstructor (this); m_bCancelled = true; - m_bDone = true; - // theApp->removeBackgroundTask (this); + m_bCancelling = false; + cleanUp(); } void -ThreadedReconstructor::onDone() +ReconstructorSupervisor::cleanUp() { - for (int i = 0; i < m_iNumThreads; i++) - delete m_vecpReconstructor[i]; - + wxCriticalSection cleanSection; + cleanSection.Enter(); + + m_critsectThreadContainer.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(); + } + m_critsectThreadContainer.Leave(); + + for (i = 0; i < m_iNumThreads; 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); - ImageFileDocument* pReconDoc = theApp->newImageDoc(); - if (! pReconDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } - - ImageFile* pImageFile = getImageFile(); - pReconDoc->setImageFile (pImageFile); - if (theApp->getAskDeleteNewDocs()) - pReconDoc->Modify (true); - pReconDoc->UpdateAllViews (m_pProjView); - if (ImageFileView* rasterView = pReconDoc->getView()) { - rasterView->OnUpdate (rasterView, NULL); - rasterView->getFrame()->SetFocus(); - rasterView->getFrame()->Show(true); - } - *theApp->getLog() << m_strLabel << "\n"; - pImageFile->labelAdd (m_pProjView->GetDocument()->getProjections().getLabel()); - pImageFile->labelAdd (m_strLabel.c_str(), m_pTimer->timerEnd()); - delete m_pTimer; - - wxIdleEvent event; - theApp->OnIdle(event); - m_bDone = true; - // theApp->removeBackgroundTask (this); - // delete this; + theApp->getBackgroundManager()->taskDone (this); + + cleanSection.Leave(); } - void -ThreadedReconstructor::OnThreadEvent (wxCommandEvent& event) +ReconstructorSupervisor::onDone() { - if (m_bCancelling) { - cancel(); + wxCriticalSection doneSection; + doneSection.Enter(); + + m_pProjView->GetDocument()->removeReconstructor (this); + ImageFileDocument* pReconDoc = theApp->newImageDoc(); + if (! pReconDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + doneSection.Leave(); return; } + + ImageFile* pImageFile = getImageFile(); + pReconDoc->setImageFile (pImageFile); + if (theApp->getAskDeleteNewDocs()) + pReconDoc->Modify (true); + pReconDoc->UpdateAllViews (m_pProjView); + if (ImageFileView* rasterView = pReconDoc->getView()) { + rasterView->OnUpdate (rasterView, NULL); + rasterView->getFrame()->SetFocus(); + rasterView->getFrame()->Show(true); + } + *theApp->getLog() << m_strLabel << "\n"; + pImageFile->labelAdd (m_pProjView->GetDocument()->getProjections().getLabel()); + pImageFile->labelAdd (m_strLabel.c_str(), m_pTimer->timerEnd()); + + doneSection.Leave(); + cleanUp(); +} - wxCriticalSectionLocker locker (m_criticalSection); - - int iEventId = event.GetInt(); - if (iEventId == RTHREAD_UNIT_COMPLETE) { +void +ReconstructorSupervisor::OnWorkerUnitTick (wxCommandEvent& event) +{ ++m_iViewsDone; - *theApp->getLog() << "Views done: " << static_cast(m_iViewsDone) <<"\n"; - + +#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); - - // m_bCancelling = theApp->updateBackgroundTask (this, m_iViewsDone); - if (m_iViewsDone == m_iTotalViews) { - delete m_pDialogProgress; - m_pDialogProgress = NULL; - onDone(); + else if (m_pGauge) { + m_pGauge->SetValue (m_iViewsDone - 1); + m_bCancelling = theApp->getBackgroundManager()->isCancelling(this); } - if (m_bCancelling) { + if (! isDone() && m_bCancelling) { cancel(); return; } - } - else if (event.GetInt() >= 0) { - m_iRunning--; - m_vecpThread[event.GetInt()] = NULL; - *theApp->getLog() << "Thread finished. Remaining threads: " << m_iRunning << "\n"; +} + +void +ReconstructorSupervisor::OnWorkerDone (wxCommandEvent& event) +{ + if (isDone()) + return; + + m_iRunning--; + m_critsectThreadContainer.Enter(); + m_vecpThread[event.GetInt()] = NULL; + m_critsectThreadContainer.Leave(); + wxString msg; + msg.Printf("Reconstructor Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning); + wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + eventLog.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event + + if (m_iRunning <= 0) { + onDone(); + return; } - else - *theApp->getLog() << "Got event #" << iEventId << "\n"; +} +void +ReconstructorSupervisor::OnWorkerFail (wxCommandEvent& event) +{ + if (isDone()) + return; + + m_iRunning--; + m_critsectThreadContainer.Enter(); + m_vecpThread[event.GetInt()] = NULL; + m_critsectThreadContainer.Leave(); + wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + eventLog.SetString( event.GetString() ); + wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event + + onDone(); +} + + +void +ReconstructorSupervisor::OnThreadEvent (wxCommandEvent& event) +{ + wxString msg; + msg.Printf("Reconstructor Supervisor: Received event #%d\n", event.GetInt()); + wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + eventLog.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event } ImageFile* -ThreadedReconstructor::getImageFile() const +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++) { ImageFileArrayConst pChildArray = m_vecpChildImageFile[i]->getArray(); @@ -232,60 +276,78 @@ ThreadedReconstructor::getImageFile() const for (int iy = 0; iy < m_iImageNY; iy++) pArray[ix][iy] += pChildArray[ix][iy]; } - - for (i = 0; i < m_iNumThreads; i++) { - delete m_vecpChildImageFile[i]; -// m_vecpChildImageFile[i] = NULL; - } - + return (pImageFile); } bool -ThreadedReconstructor::testDone() +ReconstructorSupervisor::testDone() { - return (m_iRunning <= 0 ? true : false); + return (m_iRunning <= 0 ? true : false); } -ThreadedReconstructor::~ThreadedReconstructor() +ReconstructorSupervisor::~ReconstructorSupervisor() { } -ReconstructionThread::ReconstructionThread (ThreadedReconstructor* pSupervisor, - Reconstructor* pReconstructor, int iThread, int iStartView, int iNumViews) -: m_pSupervisor(pSupervisor), m_pReconstructor(pReconstructor), - m_iStartView(iStartView), m_iNumViews(iNumViews), m_iThread(iThread), - wxThread(wxTHREAD_DETACHED) +ReconstructorWorker::ReconstructorWorker +(ReconstructorSupervisor* 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), + m_pProjView(pProjView), m_pImageFile(pImageFile), m_strFilterName(pszFilterName), m_dFilterParam(dFilterParam), m_strFilterMethod(pszFilterMethod), + m_iZeropad(iZeropad), m_strFilterGenerationName(pszFilterGenerationName), m_strInterpName(pszInterpName), + m_iInterpParam(iInterpParam), m_strBackprojectName(pszBackprojectName), + wxThread(wxTHREAD_DETACHED) { } wxThread::ExitCode -ReconstructionThread::Entry () +ReconstructorWorker::Entry () { - wxCommandEvent eventProgress (wxEVT_COMMAND_MENU_SELECTED, RECONSTRUCTION_THREAD_EVENT); - for (int iView = 0; iView < m_iNumViews; iView++) { - if (TestDestroy()) { + Reconstructor* pReconstructor = new Reconstructor (m_pProjView->GetDocument()->getProjections(), + *m_pImageFile, 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(), Trace::TRACE_NONE); + if (pReconstructor->fail()) { wxString msg; - msg.Printf("TestDestroy TRUE at view #%d\n", iView); - wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + msg.Printf("Unable to make reconstructor: %s", pReconstructor->failMessage()); + wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_FAIL ); event.SetString( msg ); wxPostEvent( theApp->getMainFrame(), event ); // send in a thread-safe way - return reinterpret_cast(RTHREAD_THREAD_CANCELLED); - } - m_pReconstructor->reconstructView (iView + m_iStartView, 1); - eventProgress.SetInt (RTHREAD_UNIT_COMPLETE); - wxPostEvent (m_pSupervisor, eventProgress); - } + return reinterpret_cast(-1); + } - eventProgress.SetInt (m_iThread); // Send back thread# that has finished - wxPostEvent (m_pSupervisor, eventProgress); + wxCommandEvent eventProgress (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_UNIT_TICK); - return reinterpret_cast(0); + for (int iView = 0; iView < m_iNumViews; iView++) { + if (TestDestroy()) { +#ifdef DEBUG + wxString msg; + msg.Printf("Received destroy message view #%d\n", iView); + wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + event.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), event ); // send in a thread-safe way +#endif + delete pReconstructor; + return reinterpret_cast(-1); + } + pReconstructor->reconstructView (iView + m_iStartView, 1); + wxPostEvent (m_pSupervisor, eventProgress); + } + pReconstructor->postProcessing(); + + wxCommandEvent eventDone (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_DONE); + eventProgress.SetInt (m_iThread); // Send back thread# that has finished + wxPostEvent (m_pSupervisor, eventDone); + + delete pReconstructor; + return reinterpret_cast(0); } void -ReconstructionThread::OnExit () +ReconstructorWorker::OnExit () { }