Return separate counts of TID reqs that succeed and result in error

[trust_router.git] / include / tr_mq.h

diff --git a/include/tr_mq.h b/include/tr_mq.h
index 81cb325..b15081c 100644 (file)
--- a/include/tr_mq.h
+++ b/include/tr_mq.h
@@ -37,21 +37,12 @@
 
 #include <talloc.h>
 #include <pthread.h>
-
-/* Note on mq priorities: High priority messages are guaranteed to be
- * processed before any normal priority messages. Otherwise, messages
- * will be processed in the order they are added to the queue. */
-
-typedef enum tr_mq_priority {
-  TR_MQ_PRIO_NORMAL=0,
-  TR_MQ_PRIO_HIGH
-} TR_MQ_PRIORITY;
+#include <time.h>
 
 /* msg for inter-thread messaging */
 typedef struct tr_mq_msg TR_MQ_MSG;
 struct tr_mq_msg {
   TR_MQ_MSG *next;
-  TR_MQ_PRIORITY prio;
   char *message;
   void *p; /* payload */
   void (*p_free)(void *); /* function to free payload */
@@ -63,9 +54,9 @@ typedef struct tr_mq TR_MQ;
 typedef void (*TR_MQ_NOTIFY_FN)(TR_MQ *, void *);
 struct tr_mq {
   pthread_mutex_t mutex;
+  pthread_cond_t have_msg_cond;
   TR_MQ_MSG *head;
   TR_MQ_MSG *tail;
-  TR_MQ_MSG *last_hi_prio;
   TR_MQ_NOTIFY_FN notify_cb; /* callback when queue becomes non-empty */
   void *notify_cb_arg;
 };
@@ -73,9 +64,8 @@ struct tr_mq {
 /* message string for sending trpc messages */
 #define TR_MQMSG_TRPC_SEND "trpc send msg"
 
-TR_MQ_MSG *tr_mq_msg_new(TALLOC_CTX *mem_ctx, const char *msg, TR_MQ_PRIORITY prio);
+TR_MQ_MSG *tr_mq_msg_new(TALLOC_CTX *mem_ctx, const char *msg);
 void tr_mq_msg_free(TR_MQ_MSG *msg);
-TR_MQ_PRIORITY tr_mq_msg_get_prio(TR_MQ_MSG *msg);
 const char *tr_mq_msg_get_message(TR_MQ_MSG *msg);
 void *tr_mq_msg_get_payload(TR_MQ_MSG *msg);
 void tr_mq_msg_set_payload(TR_MQ_MSG *msg, void *p, void (*p_free)(void *));
@@ -87,7 +77,8 @@ int tr_mq_lock(TR_MQ *mq);
 int tr_mq_unlock(TR_MQ *mq);
 void tr_mq_set_notify_cb(TR_MQ *mq, TR_MQ_NOTIFY_FN cb, void *arg);
 void tr_mq_add(TR_MQ *mq, TR_MQ_MSG *msg);
-TR_MQ_MSG *tr_mq_pop(TR_MQ *mq);
+int tr_mq_pop_timeout(time_t seconds, struct timespec *ts);
+TR_MQ_MSG *tr_mq_pop(TR_MQ *mq, struct timespec *ts_abort);
 void tr_mq_clear(TR_MQ *mq);
  
 #endif /*_TR_MQ_H_ */