Rename mesh_mutex to mutex.

[meshlink] / src / meshlink_queue.h

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index 511d0b3ccf5c52b72bed6a0a02c54b09a25ea65a..764f4162c4b62728752ca042ea3e5a1808adfb14 100644 (file)
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -36,17 +36,36 @@ typedef struct meshlink_queue_item {
        struct meshlink_queue_item *next;
 } meshlink_queue_item_t;
 
+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);
+}
+
+static inline void meshlink_queue_exit(meshlink_queue_t *queue) {
+       pthread_mutex_destroy(&queue->mutex);
+}
+
 static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
-       meshlink_queue_item_t *item = malloc(sizeof *item);
-       if(!item)
+       meshlink_queue_item_t *item = malloc(sizeof(*item));
+
+       if(!item) {
                return false;
+       }
+
        item->data = data;
        item->next = NULL;
        pthread_mutex_lock(&queue->mutex);
-       if(!queue->tail)
+
+       if(!queue->tail) {
                queue->head = queue->tail = item;
-       else
+       } else {
                queue->tail = queue->tail->next = item;
+       }
+
        pthread_mutex_unlock(&queue->mutex);
        return true;
 }
@@ -55,11 +74,15 @@ static inline void *meshlink_queue_pop(meshlink_queue_t *queue) {
        meshlink_queue_item_t *item;
        void *data;
        pthread_mutex_lock(&queue->mutex);
+
        if((item = queue->head)) {
                queue->head = item->next;
-               if(!queue->head)
+
+               if(!queue->head) {
                        queue->tail = NULL;
+               }
        }
+
        pthread_mutex_unlock(&queue->mutex);
        data = item ? item->data : NULL;
        free(item);