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/Globals.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/Globals.cpp')
-rw-r--r-- | src/Globals.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/Globals.cpp b/src/Globals.cpp index b983e3c..5f32482 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -40,5 +40,19 @@ _AstraExport bool cudaAvailable() { #endif } + +static bool (*pShouldAbortHook)(void) = 0; + +void setShouldAbortHook(bool (*_pShouldAbortHook)(void)) { + pShouldAbortHook = _pShouldAbortHook; +} + +bool shouldAbort() { + if (pShouldAbortHook && (*pShouldAbortHook)()) + return true; + + return false; +} + } |