Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / meshlink_queue.h

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index 996231807096dc878036492450b24b38c5ecf7ac..665c4d6e8d7553ec090d56268445224cc0fdb4bd 100644 (file)
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -39,13 +39,14 @@ typedef struct meshlink_queue_item {
 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);
+       pthread_mutex_init(&queue->mutex, NULL);
 }
 
-static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
+static inline void meshlink_queue_exit(meshlink_queue_t *queue) {
+       pthread_mutex_destroy(&queue->mutex);
+}
+
+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) {
@@ -54,7 +55,10 @@ static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
 
        item->data = data;
        item->next = NULL;
-       pthread_mutex_lock(&queue->mutex);
+
+       if(pthread_mutex_lock(&queue->mutex) != 0) {
+               abort();
+       }
 
        if(!queue->tail) {
                queue->head = queue->tail = item;
@@ -66,10 +70,12 @@ static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
        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);
+
+       if(pthread_mutex_lock(&queue->mutex) != 0) {
+               abort();
+       }
 
        if((item = queue->head)) {
                queue->head = item->next;
@@ -80,7 +86,33 @@ static inline void *meshlink_queue_pop(meshlink_queue_t *queue) {
        }
 
        pthread_mutex_unlock(&queue->mutex);
-       data = item ? item->data : NULL;
+
+       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;
+
+       if(pthread_mutex_lock(&queue->mutex) != 0) {
+               abort();
+       }
+
+       while(!queue->head) {
+               pthread_cond_wait(cond, &queue->mutex);
+       }
+
+       item = queue->head;
+       queue->head = item->next;
+
+       if(!queue->head) {
+               queue->tail = NULL;
+       }
+
+       pthread_mutex_unlock(&queue->mutex);
+
+       void *data = item->data;
        free(item);
        return data;
 }