Merge pull request #100 from painless-security/milestone/monitoring

[trust_router.git] / include / tr_mq.h

diff --git a/include/tr_mq.h b/include/tr_mq.h
index f60c7af..b15081c 100644 (file)
--- a/include/tr_mq.h
+++ b/include/tr_mq.h
@@ -39,20 +39,10 @@
 #include <pthread.h>
 #include <time.h>
 
 #include <pthread.h>
 #include <time.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;
-

 /* msg for inter-thread messaging */
 typedef struct tr_mq_msg TR_MQ_MSG;
 struct tr_mq_msg {
   TR_MQ_MSG *next;
 /* 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 */
   char *message;
   void *p; /* payload */
   void (*p_free)(void *); /* function to free payload */


@@ -67,7 +57,6 @@ struct tr_mq {
   pthread_cond_t have_msg_cond;
   TR_MQ_MSG *head;
   TR_MQ_MSG *tail;
   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;
 };
   TR_MQ_NOTIFY_FN notify_cb; /* callback when queue becomes non-empty */
   void *notify_cb_arg;
 };


@@ -75,9 +64,8 @@ struct tr_mq {
 /* message string for sending trpc messages */
 #define TR_MQMSG_TRPC_SEND "trpc send msg"
 
 /* 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);
 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 *));
 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 *));