HeapRing: add some sanity checks

diff --git a/src/libs/HeapRing.cpp b/src/libs/HeapRing.cpp
index f3e0809..b4d3c4a 100644 (file)
--- a/src/libs/HeapRing.cpp
+++ b/src/libs/HeapRing.cpp
@@ -113,12 +113,14 @@ template<class kind> kind* HeapRing<kind>::item_ref(unsigned int i)
 
 template<class kind> void HeapRing<kind>::produce_head()
 {
+    while (is_full());
     head_i = next(head_i);
 }
 
 template<class kind> void HeapRing<kind>::consume_tail()
 {
-    tail_i = next(tail_i);
+    if (!is_empty())
+        tail_i = next(tail_i);
 }
 
 /*
@@ -127,12 +129,20 @@ template<class kind> void HeapRing<kind>::consume_tail()
 
 template<class kind> bool HeapRing<kind>::is_full()
 {
-    return (next(head_i) == tail_i);
+    __disable_irq();
+    bool r = (next(head_i) == tail_i);
+    __enable_irq();
+
+    return r;
 }
 
 template<class kind> bool HeapRing<kind>::is_empty()
 {
-    return (head_i == tail_i);
+    __disable_irq();
+    bool r = (head_i == tail_i);
+    __enable_irq();
+
+    return r;
 }
 
 /*

diff --git a/src/libs/HeapRing.h b/src/libs/HeapRing.h
index fd13cb1..c0aef58 100644 (file)
--- a/src/libs/HeapRing.h
+++ b/src/libs/HeapRing.h
@@ -75,6 +75,7 @@ protected:
     volatile unsigned int head_i;
     volatile unsigned int tail_i;
 
+private:
     kind* ring;
 };