diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
| commit | d9261bdb05cd0863a2c3747c812871dbb851646e (patch) | |
| tree | d1a81110e3fe213747a58f236e021a085417f663 /src/CudaSirtAlgorithm3D.cpp | |
| parent | 9a58b7451179ed512f975bc4c90fb71f172250b9 (diff) | |
| download | astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.gz astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.bz2 astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.xz astra-d9261bdb05cd0863a2c3747c812871dbb851646e.zip | |
Replace signal-based abort handling by query-based handling
The abort handling is currently only used to process Ctrl-C from Matlab.
Since Matlab R2019a, it appears that calling utIsInterruptPending() from
a thread other than the main thread will crash. The previous approach of
checking utIsInterruptPending() in a thread, and then signalling the running
algorithm was therefore broken.
Diffstat (limited to 'src/CudaSirtAlgorithm3D.cpp')
| -rw-r--r-- | src/CudaSirtAlgorithm3D.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index 2483704..17fea67 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -275,13 +275,6 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) } //---------------------------------------------------------------------------------------- -void CCudaSirtAlgorithm3D::signalAbort() -{ - if (m_bIsInitialized && m_pSirt) { - m_pSirt->signalAbort(); - } -} - bool CCudaSirtAlgorithm3D::getResidualNorm(float32& _fNorm) { if (!m_bIsInitialized || !m_pSirt) |