mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-12 13:30:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread-loop: improve error checking

Browse source
This commit is contained in:
Wim Taymans 2018-12-20 10:33:59 +01:00
parent bcec14decb
commit c511b530ed
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/pipewire/thread-loop.c
View file

@ -74,6 +74,14 @@ static void do_stop(void *data, uint64_t count)
this->running = false; this->running = false;
} }
#define CHECK(expression,label) \
do { \
if ((errno = expression) != 0) { \
pw_log_error(#expression ": %s", strerror(errno)); \
goto label; \
} \
} while(false);
/** Create a new \ref pw_thread_loop /** Create a new \ref pw_thread_loop
* *
* \param loop the loop to wrap * \param loop the loop to wrap
@ -97,7 +105,7 @@ struct pw_thread_loop *pw_thread_loop_new(struct pw_loop *loop,
this = calloc(1, sizeof(struct pw_thread_loop)); this = calloc(1, sizeof(struct pw_thread_loop));
if (this == NULL) if (this == NULL)
goto error1; goto no_mem;
pw_log_debug("thread-loop %p: new", this); pw_log_debug("thread-loop %p: new", this);
@ -106,35 +114,33 @@ struct pw_thread_loop *pw_thread_loop_new(struct pw_loop *loop,
spa_hook_list_init(&this->listener_list); spa_hook_list_init(&this->listener_list);
pthread_mutexattr_init(&attr); CHECK(pthread_mutexattr_init(&attr), clean_this);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); CHECK(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE), clean_this);
if ((errno = pthread_mutex_init(&this->lock, &attr)) != 0) CHECK(pthread_mutex_init(&this->lock, &attr), clean_this);
goto error2;
pthread_condattr_init(&cattr); CHECK(pthread_condattr_init(&cattr), clean_lock);
pthread_condattr_setclock(&cattr, CLOCK_REALTIME); CHECK(pthread_condattr_setclock(&cattr, CLOCK_REALTIME), clean_lock);
if ((errno = pthread_cond_init(&this->cond, &cattr)) != 0)
goto error3; CHECK(pthread_cond_init(&this->cond, &cattr), clean_lock);
if ((errno = pthread_cond_init(&this->accept_cond, &cattr)) != 0) CHECK(pthread_cond_init(&this->accept_cond, &cattr), clean_cond);
goto error4;
if ((this->event = pw_loop_add_event(this->loop, do_stop, this)) == NULL) if ((this->event = pw_loop_add_event(this->loop, do_stop, this)) == NULL)
goto error5; goto clean_acceptcond;
pw_loop_add_hook(loop, &this->hook, &impl_hooks, this); pw_loop_add_hook(loop, &this->hook, &impl_hooks, this);
return this; return this;
error5: clean_acceptcond:
pthread_cond_destroy(&this->accept_cond); pthread_cond_destroy(&this->accept_cond);
error4: clean_cond:
pthread_cond_destroy(&this->cond); pthread_cond_destroy(&this->cond);
error3: clean_lock:
pthread_mutex_destroy(&this->lock); pthread_mutex_destroy(&this->lock);
error2: clean_this:
free(this->name); free(this->name);
free(this); free(this);
error1: no_mem:
return NULL; return NULL;
} }