X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_queue.h;h=665c4d6e8d7553ec090d56268445224cc0fdb4bd;hb=4b6c01b1d5383b1a7417244a31ad4652aab2d5db;hp=a713f93f24a0b2b36ed66dea5ad48f4653dce371;hpb=76c7550c8ab0e9c0ee14a9c396baa008cfb9bc42;p=meshlink

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index a713f93f..665c4d6e 100644
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -36,32 +36,83 @@ typedef struct meshlink_queue_item {
 	struct meshlink_queue_item *next;
 } meshlink_queue_item_t;
 
-static inline bool meshlink_queue_push(meshlink_queue_t *queue, void *data) {
+static inline void meshlink_queue_init(meshlink_queue_t *queue) {
+	queue->head = NULL;
+	queue->tail = NULL;
+	pthread_mutex_init(&queue->mutex, NULL);
+}
+
+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)
+
+	if(!item) {
 		return false;
+	}
+
 	item->data = data;
 	item->next = NULL;
-	pthread_mutex_lock(&queue->mutex);
-	if(!queue->tail)
+
+	if(pthread_mutex_lock(&queue->mutex) != 0) {
+		abort();
+	}
+
+	if(!queue->tail) {
 		queue->head = queue->tail = item;
-	else
+	} else {
 		queue->tail = queue->tail->next = item;
+	}
+
 	pthread_mutex_unlock(&queue->mutex);
 	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;
-		if(!queue->head)
+
+		if(!queue->head) {
 			queue->tail = NULL;
+		}
 	}
+
 	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;
 }