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 /cuda/3d/astra3d.cu | |
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 'cuda/3d/astra3d.cu')
-rw-r--r-- | cuda/3d/astra3d.cu | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu index be258be..51e76cd 100644 --- a/cuda/3d/astra3d.cu +++ b/cuda/3d/astra3d.cu @@ -625,14 +625,6 @@ bool AstraSIRT3d::getReconstruction(float* pfReconstruction, return true; } -void AstraSIRT3d::signalAbort() -{ - if (!pData->initialized) - return; - - pData->sirt.signalAbort(); -} - float AstraSIRT3d::computeDiffNorm() { if (!pData->initialized) @@ -1006,14 +998,6 @@ bool AstraCGLS3d::getReconstruction(float* pfReconstruction, return true; } -void AstraCGLS3d::signalAbort() -{ - if (!pData->initialized) - return; - - pData->cgls.signalAbort(); -} - float AstraCGLS3d::computeDiffNorm() { if (!pData->initialized) |