diff options
| author | Marton Balint <cus@passwd.hu> | 2020-01-22 21:03:13 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-01-25 23:16:18 +0100 |
| commit | 1812b42554639175c466d4f1e401ea913fc3cccc (patch) | |
| tree | f8baef5e99966cb5dcd7d0d9916041ec377a0f18 /libavutil/thread.h | |
| parent | 4b4bcb126c303619e35f29e16caaa2e8962cf34d (diff) | |
| download | ffmpeg-1812b42554639175c466d4f1e401ea913fc3cccc.tar.gz | |
avutil/thread: fix strict_pthread_cond_timedwait
Timeout error was assumed to be fatal which it is not.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavutil/thread.h')
| -rw-r--r-- | libavutil/thread.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/libavutil/thread.h b/libavutil/thread.h index 65b97ef303..be5c4b1340 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -33,16 +33,19 @@ #include "log.h" +#define ASSERT_PTHREAD_ABORT(func, ret) do { \ + char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ + av_log(NULL, AV_LOG_FATAL, AV_STRINGIFY(func) \ + " failed with error: %s\n", \ + av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, \ + AVERROR(ret))); \ + abort(); \ +} while (0) + #define ASSERT_PTHREAD_NORET(func, ...) do { \ int ret = func(__VA_ARGS__); \ - if (ret) { \ - char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ - av_log(NULL, AV_LOG_FATAL, AV_STRINGIFY(func) \ - " failed with error: %s\n", \ - av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, \ - AVERROR(ret))); \ - abort(); \ - } \ + if (ret) \ + ASSERT_PTHREAD_ABORT(func, ret); \ } while (0) #define ASSERT_PTHREAD(func, ...) do { \ @@ -112,7 +115,10 @@ static inline int strict_pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t static inline int strict_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime) { - ASSERT_PTHREAD(pthread_cond_timedwait, cond, mutex, abstime); + int ret = pthread_cond_timedwait(cond, mutex, abstime); + if (ret && ret != ETIMEDOUT) + ASSERT_PTHREAD_ABORT(pthread_cond_timedwait, ret); + return ret; } static inline int strict_pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) |