Changeset 4625:b38e2e191e5b in roaraudio for libroar/buffer.c

Timestamp:

11/27/10 03:42:03 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated ring buffer code (Closes: #91)

File:

• libroar/buffer.c (modified) (5 diffs)

libroar/buffer.c

@@ -577 +577 @@
  size_t tmp;
 
+ ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = ?", buf, data, len);
+
  if ( buf == NULL || len == NULL )
   return -1;
@@ -618 +620 @@
 
   if ( ring->write_pos >= ring->read_pos ) {
+   ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = ?", buf, data, len);
+
    havelen = buf->user_len - ring->write_pos;
 
@@ -642 +646 @@
 
    *len = done;
+   ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = 0", buf, data, len);
    return 0;
   } else {
+   ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = ?", buf, data, len);
+
    // test for buffer-is-full:
    if ( (ring->write_pos + 1) == ring->read_pos ) {
     *len = 0;
+    ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = 0", buf, data, len);
     return 0;
    }
 
+   ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = ?", buf, data, len);
+
    havelen = ring->read_pos - ring->write_pos - 1;
 
@@ -657 +667 @@
    memcpy(buf->user_data+ring->write_pos, data, havelen);
 
+   ring->write_pos += havelen;
    *len = havelen;
+
+   ROAR_DBG("roar_buffer_ring_write(buf=%p, data=%p, len=%p) = 0", buf, data, len);
    return 0;
   }
@@ -667 +680 @@
 }
 
+int roar_buffer_ring_avail(struct roar_buffer *  buf, size_t * readlen, size_t * writelen) {
+ struct roar_buffer_ring * ring;
+ size_t have;
+
+ if ( buf == NULL )
+  return -1;
+
+ if ( !(buf->flags & ROAR_BUFFER_FLAG_RING) )
+  return -1;
+
+ ring = &(buf->meta.ring);
+
+ ROAR_DBG("roar_buffer_ring_avail(buf=%p, readlen=%p, writelen=%p) = ?", buf, readlen, writelen);
+
+ if ( readlen != NULL ) {
+  have = 0;
+
+  if ( ring->write_pos >= ring->read_pos ) {
+   have  = ring->write_pos - ring->read_pos;
+  } else {
+   have  = buf->user_len - ring->read_pos;
+   have += ring->write_pos;
+   have -= 1;
+  }
+
+  *readlen = have;
+  ROAR_DBG("roar_buffer_ring_avail(buf=%p, readlen=%p, writelen=%p): readlen=%llu", buf, readlen, writelen, (unsigned long long int)have);
+ }
+
+ if ( writelen != NULL ) {
+  have = 0;
+
+  if ( ring->read_pos > ring->write_pos ) {
+   have  = ring->read_pos - ring->write_pos - 1;
+  } else {
+   have  = buf->user_len - ring->write_pos;
+   have += ring->read_pos;
+   have -= 1;
+  }
+
+  *writelen = have;
+  ROAR_DBG("roar_buffer_ring_avail(buf=%p, readlen=%p, writelen=%p): readlen=%llu", buf, readlen, writelen, (unsigned long long int)have);
+ }
+
+ ROAR_DBG("roar_buffer_ring_avail(buf=%p, readlen=%p, writelen=%p) = 0", buf, readlen, writelen);
+
+ return 0;
+}
+
 //ll