diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-02-26 11:51:50 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-02-26 11:51:50 +0100 |
| commit | d2407fea1ed7c3c718a4c115d8c632664c2378dd (patch) | |
| tree | 9f0d21c77d64da4e9be1f4b0ba99f54edc691ad5 /src | |
| parent | 3cae1d138c53a3fd042de3d2c9d9a07cf0650e0f (diff) | |
| parent | 0ca00f4c671d6d583ae77838d3e0d4fcd411f077 (diff) | |
| download | astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.gz astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.bz2 astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.xz astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.zip | |
Merge branch 'master' into python-interface
Diffstat (limited to 'src')
| -rw-r--r-- | src/AsyncAlgorithm.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp index fcc4dcb..b265f59 100644 --- a/src/AsyncAlgorithm.cpp +++ b/src/AsyncAlgorithm.cpp @@ -160,32 +160,6 @@ void CAsyncAlgorithm::runWrapped(int _iNrIterations) m_bDone = true; } -void CAsyncAlgorithm::timedJoin(int _milliseconds) -{ -#ifndef USE_PTHREADS - if (m_pThread) { - boost::posix_time::milliseconds rel(_milliseconds); - bool res = m_pThread->timed_join(rel); - if (res) { - delete m_pThread; - m_pThread = 0; - m_bThreadStarted = false; - } - } -#else - if (m_bThreadStarted) { - struct timespec abstime; - clock_gettime(CLOCK_REALTIME, &abstime); - abstime.tv_sec += _milliseconds / 1000; - abstime.tv_nsec += (_milliseconds % 1000) * 1000000L; - int err = pthread_timedjoin_np(m_thread, 0, &abstime); - if (err == 0) { - m_bThreadStarted = false; - } - } -#endif -} - void CAsyncAlgorithm::signalAbort() { if (m_pAlg) |