Queues now use flags

[mirrors/Programs.git] / c / pthread_extra / pthread_msgqueue.c

diff --git a/c/pthread_extra/pthread_msgqueue.c b/c/pthread_extra/pthread_msgqueue.c
index ff1a37f865e65afdab274ebc76f061b2748d848e..52395d6d3944b5b4c8484357992b6864bd9f844c 100644 (file)
--- a/c/pthread_extra/pthread_msgqueue.c
+++ b/c/pthread_extra/pthread_msgqueue.c
@@ -39,6 +39,10 @@ size_t pthread_mq_waiting(pthread_mq_t *mq) {
        return mq->msg_count;
 }
 
+size_t pthread_mq_vacant(pthread_mq_t *mq) {
+       return (mq->msg_count_max - mq->msg_count);
+}
+
 bool pthread_mq_reset(pthread_mq_t *mq) {
        if(pthread_mutex_lock(&mq->lock)) return false;
        mq->msg_count = 0;
@@ -48,7 +52,7 @@ bool pthread_mq_reset(pthread_mq_t *mq) {
        return true;
 }
 
-bool pthread_mq_send_generic(pthread_mq_t *mq, void * data, bool to_front, const struct timespec *restrict abs_timeout) {
+bool pthread_mq_send_generic(pthread_mq_t *mq, void * data, pthread_mq_flags_t flags, const struct timespec *restrict abs_timeout) {
        //printf("S-Timed: %p\n", abs_timeout);
        int ret;
 
@@ -72,6 +76,7 @@ bool pthread_mq_send_generic(pthread_mq_t *mq, void * data, bool to_front, const
        }
 
        //Write data to queue
+       bool to_front = (flags & PTHREAD_XMQ_FRONT);
        size_t idx = ( ( mq->head_idx + (to_front?mq->msg_count_max-1:mq->msg_count) ) % mq->msg_count_max );
        void *ptr = mq->data + (idx * mq->msg_size);
        mq->msg_count++;
@@ -84,7 +89,7 @@ bool pthread_mq_send_generic(pthread_mq_t *mq, void * data, bool to_front, const
        return true;
 }
 
-bool pthread_mq_receive_generic(pthread_mq_t *mq, void * data, bool peek, const struct timespec *restrict abs_timeout) {
+bool pthread_mq_receive_generic(pthread_mq_t *mq, void * data, pthread_mq_flags_t flags, const struct timespec *restrict abs_timeout) {
        int ret;
 
        //Lock queue
@@ -110,6 +115,7 @@ bool pthread_mq_receive_generic(pthread_mq_t *mq, void * data, bool peek, const
        memcpy(data, ptr, mq->msg_size);
 
        //Delete data from queue if not peeking
+       bool peek = (flags & PTHREAD_XMQ_PEEK);
        if(!peek) {
                mq->msg_count--;
                mq->head_idx = (mq->head_idx+1) % mq->msg_count_max;