comparison base/RingBuffer.h @ 1553:66c1988fc906

Use bqvec barrier

    This is a modified version of a source file from the 
    Rosegarden MIDI and audio sequencer and notation editor.
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _RINGBUFFER_H_
-#define _RINGBUFFER_H_
+#ifndef SV_RINGBUFFER_H
+#define SV_RINGBUFFER_H
 
 #include <sys/types.h>
 
 #include "system/System.h"
+
+#include <bqvec/Barrier.h>
 
 #include <cstring> // memcpy, memset &c
 
 //#define DEBUG_RINGBUFFER 1
 

     } else {
         memcpy(destination, m_buffer + m_readers[R], here * sizeof(T));
         memcpy(destination + here, m_buffer, (n - here) * sizeof(T));
     }
 
-    MBARRIER();
+    BQ_MBARRIER();
     m_readers[R] = (m_readers[R] + n) % m_size;
 
 #ifdef DEBUG_RINGBUFFER
     std::cerr << "RingBuffer<T," << N << ">[" << this << "]::read: read " << n << ", reader now " << m_readers[R] << std::endl;
 #endif

         for (int i = 0; i < (n - here); ++i) {
             destination[i + here] += m_buffer[i];
         }
     }
 
-    MBARRIER();
+    BQ_MBARRIER();
     m_readers[R] = (m_readers[R] + n) % m_size;
     return n;
 }
 
 template <typename T, int N>

         T t;
         memset(&t, 0, sizeof(T));
         return t;
     }
     T value = m_buffer[m_readers[R]];
-    MBARRIER();
+    BQ_MBARRIER();
     if (++m_readers[R] == m_size) m_readers[R] = 0;
     return value;
 }
 
 template <typename T, int N>

     } else {
         memcpy(m_buffer + m_writer, source, here * sizeof(T));
         memcpy(m_buffer, source + here, (n - here) * sizeof(T));
     }
 
-    MBARRIER();
+    BQ_MBARRIER();
     m_writer = (m_writer + n) % m_size;
 
 #ifdef DEBUG_RINGBUFFER
     std::cerr << "RingBuffer<T," << N << ">[" << this << "]::write: wrote " << n << ", writer now " << m_writer << std::endl;
 #endif

     } else {
         memset(m_buffer + m_writer, 0, here * sizeof(T));
         memset(m_buffer, 0, (n - here) * sizeof(T));
     }
     
-    MBARRIER();
+    BQ_MBARRIER();
     m_writer = (m_writer + n) % m_size;
     return n;
 }
 
 #endif // _RINGBUFFER_H_