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

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index 764f4162..665c4d6e 100644
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -39,17 +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 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) {
+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 +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;
@@ -70,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;
@@ -84,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;
 }