X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_queue.h;h=b6e63c67da833ce48f1bfb02caf5ee28e158f89e;hb=f13b47a184094c6c9c22faf22c4e6b1117a1d758;hp=996231807096dc878036492450b24b38c5ecf7ac;hpb=a1b6ee1e25c9b0cbd2265d86a2d4020eddba735b;p=meshlink

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index 99623180..b6e63c67 100644
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -45,7 +45,11 @@ static inline void meshlink_queue_init(meshlink_queue_t *queue) {
 	pthread_mutex_init(&queue->mutex, &attr);
 }
 
-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) {
@@ -66,9 +70,9 @@ 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((item = queue->head)) {
@@ -80,7 +84,31 @@ 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;
+
+	pthread_mutex_lock(&queue->mutex);
+
+	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;
 }