wrtd:rt: forgot to initialize the loop queue. Counter should be also atomic

87edcca1 · Tomasz Wlostowski · Federico Vaga · c783633d · 87edcca1 · 87edcca1
Commit 87edcca1 authored Jul 31, 2015 by Tomasz Wlostowski Committed by Federico Vaga Jul 31, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

loop-queue.c applications/wrtd/rt/common/loop-queue.c +3 -2

rt-fd.c applications/wrtd/rt/fd/rt-fd.c +0 -1

rt-tdc.c applications/wrtd/rt/tdc/rt-tdc.c +2 -0

No files found.
--- a/applications/wrtd/rt/common/loop-queue.c
+++ b/applications/wrtd/rt/common/loop-queue.c
@@ -41,7 +41,7 @@ void loop_queue_push(struct wrtd_trig_id *id, uint32_t seq, struct wr_timestamp
 	if (head == LOOP_QUEUE_SIZE)
 		head = 0;

-	count++;
+	smem_atomic_add(&count, 1);
 }

 struct wrtd_trigger_entry *loop_queue_pop()
@@ -55,7 +55,8 @@ struct wrtd_trigger_entry *loop_queue_pop()

 	if(tail == LOOP_QUEUE_SIZE)
 		tail = 0;
-	count--;
+	
+	smem_atomic_sub(&count, 1);

 	return rv;
 }
--- a/applications/wrtd/rt/fd/rt-fd.c
+++ b/applications/wrtd/rt/fd/rt-fd.c
@@ -727,7 +727,6 @@ void do_rx()
 		rx_ebone++;
 	}

-
 	struct wrtd_trigger_entry *ent = loop_queue_pop();

 	if (ent) {

--- a/applications/wrtd/rt/tdc/rt-tdc.c
+++ b/applications/wrtd/rt/tdc/rt-tdc.c
@@ -654,6 +654,8 @@ void init()
 {
    int i;

+    loop_queue_init();
+
    wr_state = WR_LINK_OFFLINE;
    wr_enable_lock(0);