Add asserts() to all pthread related function calls.

[meshlink] / src / meshlink_queue.h

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index 764f4162c4b62728752ca042ea3e5a1808adfb14..cacda0ed4f15e5713dfed43e68b14fa19cae6c42 100644 (file)
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -40,16 +40,16 @@ static inline void meshlink_queue_init(meshlink_queue_t *queue) {
        queue->head = NULL;
        queue->tail = NULL;
        pthread_mutexattr_t attr;
-       pthread_mutexattr_init(&attr);
-       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_DEFAULT);
-       pthread_mutex_init(&queue->mutex, &attr);
+       assert(pthread_mutexattr_init(&attr) == 0);
+       assert(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_DEFAULT) == 0);
+       assert(pthread_mutex_init(&queue->mutex, &attr) == 0);
 }
 
 static inline void meshlink_queue_exit(meshlink_queue_t *queue) {
-       pthread_mutex_destroy(&queue->mutex);
+       assert(pthread_mutex_destroy(&queue->mutex) == 0);
 }
 
-static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
+static inline __attribute__((__warn_unused_result__)) bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
        meshlink_queue_item_t *item = malloc(sizeof(*item));
 
        if(!item) {
@@ -58,7 +58,7 @@ static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
 
        item->data = data;
        item->next = NULL;
-       pthread_mutex_lock(&queue->mutex);
+       assert(pthread_mutex_lock(&queue->mutex) == 0);
 
        if(!queue->tail) {
                queue->head = queue->tail = item;
@@ -66,14 +66,14 @@ static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
                queue->tail = queue->tail->next = item;
        }
 
-       pthread_mutex_unlock(&queue->mutex);
+       assert(pthread_mutex_unlock(&queue->mutex) == 0);
        return true;
 }
 
-static inline void *meshlink_queue_pop(meshlink_queue_t *queue) {
+static inline __attribute__((__warn_unused_result__)) void *meshlink_queue_pop(meshlink_queue_t *queue) {
        meshlink_queue_item_t *item;
-       void *data;
-       pthread_mutex_lock(&queue->mutex);
+
+       assert(pthread_mutex_lock(&queue->mutex) == 0);
 
        if((item = queue->head)) {
                queue->head = item->next;
@@ -83,8 +83,32 @@ static inline void *meshlink_queue_pop(meshlink_queue_t *queue) {
                }
        }
 
-       pthread_mutex_unlock(&queue->mutex);
-       data = item ? item->data : NULL;
+       assert(pthread_mutex_unlock(&queue->mutex) == 0);
+
+       void *data = item ? item->data : NULL;
+       free(item);
+       return data;
+}
+
+static inline __attribute__((__warn_unused_result__)) void *meshlink_queue_pop_cond(meshlink_queue_t *queue, pthread_cond_t *cond) {
+       meshlink_queue_item_t *item;
+
+       assert(pthread_mutex_lock(&queue->mutex) == 0);
+
+       while(!queue->head) {
+               assert(pthread_cond_wait(cond, &queue->mutex) == 0);
+       }
+
+       item = queue->head;
+       queue->head = item->next;
+
+       if(!queue->head) {
+               queue->tail = NULL;
+       }
+
+       assert(pthread_mutex_unlock(&queue->mutex) == 0);
+
+       void *data = item->data;
        free(item);
        return data;
 }