Changeset 5348:83fcc9598253 in roaraudio

Timestamp:

12/11/11 12:38:30 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Converted roar_buffer API to fully use refcounter (Closes: #126)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/buffer.h (modified) (1 diff)
• libroar/buffer.c (modified) (5 diffs)
• libroarpulse/stream.c (modified) (3 diffs)
• roard/midi.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 v. 1.0beta0 - ?
-        * Updated API (SONAME change) (Closes: #184, #185, #128, #135, #134, #133, #129, #188)
+        * Updated API (SONAME change)
+          (Closes: #184, #185, #128, #135, #134, #133, #129, #188, #126)
         * Do not set errno to zero in ogg_vorbis codec filter (Closes: #191)
         * Updated data types for struct roar_audio_info (Closes: #189)

include/libroar/buffer.h

@@ -65 +65 @@
 #define roar_buffer_free(x)    roar_buffer_unref(x)
 
-#define roar_buffer_foreach(cur) for (; (cur) != NULL; (cur) = (roar_buffer_get_next((cur), &(cur)) == -1) ? NULL : (cur))
+#define roar_buffer_foreach(cur) for (; (cur) != NULL; (cur) = (roar_buffer_next(&(cur)) == -1) ? NULL : (cur))
 
 int roar_buffer_new_no_ma(struct roar_buffer ** buf, size_t len, void * data) _LIBROAR_BUFFER_STDATTRS; // no internal malloc

libroar/buffer.c

@@ -181 +181 @@
  ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
 
- flags = buf->flags & (ROAR_BUFFER_FLAG_USEABLE|ROAR_BUFFER_FLAG_FREED);
- if ( flags == ROAR_BUFFER_FLAG_FREED ) {
-  roar_panic(ROAR_FATAL_ERROR_MEMORY_DOUBLE_FREE, NULL);
- }
-
- _ckmem_corruption(buf, 0);
-
- ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
-
- if ( buf->refc == 0 ) {
-  ROAR_WARN("roar_buffer_unref(buf=%p): Ref counter is wrong. assuming one.");
-  buf->refc = 1;
-  roar_panic(ROAR_FATAL_ERROR_MEMORY_CORRUPTION, NULL);
- }
-
- buf->refc--;
-
- if ( buf->refc ) {
-  ROAR_DBG("roar_buffer_unref(buf=%p) = 0", buf);
-  return 0;
- }
-
- ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
-
- cur = buf->next;
+ cur = buf;
  while (cur != NULL) {
   flags = cur->flags & (ROAR_BUFFER_FLAG_USEABLE|ROAR_BUFFER_FLAG_FREED);
@@ -212 +188 @@
   }
 
+  _ckmem_corruption(cur, 0);
+
+  if ( cur->refc == 0 ) {
+   ROAR_WARN("roar_buffer_unref(buf=%p): Ref counter for buffer at %p is wrong. assuming one.", cur);
+   cur->refc = 1;
+   roar_panic(ROAR_FATAL_ERROR_MEMORY_CORRUPTION, NULL);
+  } else if ( cur->refc > 1 ) {
+   cur->refc--;
+   return 0;
+  }
+
   ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
-
-  _ckmem_corruption(cur, 0);
 
   if ( roar_buffer_get_flag(cur, ROAR_BUFFER_FLAG_NOFREE) != 1 )
@@ -224 +209 @@
   cur = next;
  }
-
- ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
-
- if ( !(buf->flags & ROAR_BUFFER_FLAG_NOFREE) )
-  roar_mm_free(buf->data);
-
- ROAR_DBG("roar_buffer_unref(buf=%p): setting flags = ROAR_BUFFER_FLAG_FREED", buf);
- buf->flags = ROAR_BUFFER_FLAG_FREED;
-
- roar_mm_free(buf);
 
  ROAR_DBG("roar_buffer_unref(buf=%p) = 0", buf);
@@ -247 +222 @@
  }
 
- ROAR_DBG("buffer_delete(buf=%p, next=%p) = ?", buf, next);
-
- if ( next != NULL )
-  *next = buf->next;
-
- if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 )
-  roar_mm_free(buf->data);
-
- roar_mm_free(buf);
-
- ROAR_DBG("buffer_delete(buf=%p, next=%p) = 0", buf, next);
- return 0;
+ ROAR_DBG("roar_buffer_delete(buf=%p, next=%p) = ?", buf, next);
+
+ if ( next != NULL ) {
+  *next = buf;
+  return roar_buffer_next(next);
+ } else {
+  return roar_buffer_unref(buf);
+ }
 }
 
 int roar_buffer_next     (struct roar_buffer ** buf) {
- return roar_buffer_delete(*buf, buf);
+ struct roar_buffer * ret;
+
+ if ( buf == NULL || *buf == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+ }
+
+ ret = (*buf)->next;
+
+ if ( ret != NULL )
+  roar_buffer_ref(ret);
+
+ roar_buffer_unref(*buf);
+
+ *buf = ret;
+
+ return 0;
 }
 
 int roar_buffer_add      (struct roar_buffer * buf, struct roar_buffer *  next) {
+ if ( roar_buffer_ref(next) == -1 )
+  return -1;
  return roar_buffer_moveinto(buf, &next);
 }
@@ -314 +302 @@
  *next = buf->next;
 
- return 0;
+ return roar_buffer_ref(*next);
 }
 

libroarpulse/stream.c

@@ -235 +235 @@
    break;
   case PA_STREAM_RECORD:
-    if ( roar_buffer_new(&buf, s->fragments.size) == -1 )
+    if ( roar_buffer_new_data(&buf, s->fragments.size, &data) == -1 )
      return;
-
-    if ( roar_buffer_get_data(buf, &data) == -1 ) {
-     roar_buffer_free(buf);
-     return;
-    }
 
     if ( (ret = roar_vio_read(&(s->vio), data, s->fragments.size)) < 1 ) {
@@ -442 +437 @@
  // seems we have a valid write from here.
 
- if ( roar_buffer_new(&buf, length) == -1 ) {
-  if ( free_cb != NULL )
-   free_cb((void*)data);
-
-  return -1;
- }
-
- if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
+ if ( roar_buffer_new_data(&buf, length, &bufdata) == -1 ) {
   if ( free_cb != NULL )
    free_cb((void*)data);
@@ -463 +451 @@
   p->iobuffer = buf;
  } else {
-  if ( roar_buffer_moveinto(p->iobuffer, &buf) == -1 )
+  if ( roar_buffer_moveinto(p->iobuffer, &buf) == -1 ) {
+   roar_buffer_free(buf);
    return -1;
+  }
  }
 

roard/midi.c

@@ -583 +583 @@
  send_clock = streams_get_flag(id, ROAR_FLAG_SYNC);
 
+ if ( roar_buffer_ref(buf) == -1 )
+  return -1;
+
  roar_buffer_foreach(buf) {
   if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
@@ -650 +653 @@
  void                      * bufdata;
 
+ if ( roar_buffer_ref(g_midi_mess.buf) == -1 )
+  return -1;
+
  roar_buffer_foreach(buf) {
   if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {