virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avutil/thread: fix strict_pthread_cond_timedwait

Browse Source 
Timeout error was assumed to be fatal which it is not.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2020-01-22 21:03:13 +01:00
parent 4b4bcb126c
commit 1812b42554
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavutil/thread.h
View File

@ -33,16 +33,19 @@
#include "log.h" #include "log.h"
#define ASSERT_PTHREAD_NORET(func, ...) do { \ #define ASSERT_PTHREAD_ABORT(func, ret) do { \
int ret = func(__VA_ARGS__); \
if (ret) { \
char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \
av_log(NULL, AV_LOG_FATAL, AV_STRINGIFY(func) \ av_log(NULL, AV_LOG_FATAL, AV_STRINGIFY(func) \
" failed with error: %s\n", \ " failed with error: %s\n", \
av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, \ av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, \
AVERROR(ret))); \ AVERROR(ret))); \
abort(); \ abort(); \
} \ } while (0)
#define ASSERT_PTHREAD_NORET(func, ...) do { \
int ret = func(__VA_ARGS__); \
if (ret) \
ASSERT_PTHREAD_ABORT(func, ret); \
} while (0) } while (0)
#define ASSERT_PTHREAD(func, ...) do { \ #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, static inline int strict_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec *abstime) 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)) static inline int strict_pthread_once(pthread_once_t *once_control, void (*init_routine)(void))