Changeset 5388:e5cc8e03a3e1 in roaraudio for libroar

Timestamp:

01/17/12 11:27:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for refcount based VIOs as well as dynamically allocated VIOs (non-stack or global VIOs) (Closes: #127)

Location:

libroar

Files:

• vio.c (modified) (5 diffs)
• vio_bio.c (modified) (1 diff)
• vio_buffer.c (modified) (1 diff)
• vio_buffer_store.c (modified) (1 diff)
• vio_cmd.c (modified) (2 diffs)
• vio_dstr.c (modified) (1 diff)
• vio_jumbo.c (modified) (1 diff)
• vio_misc.c (modified) (1 diff)
• vio_pipe.c (modified) (1 diff)
• vio_rtp.c (modified) (1 diff)
• vio_stack.c (modified) (1 diff)
• vio_stdio.c (modified) (1 diff)
• vio_tantalos.c (modified) (1 diff)
• vio_zlib.c (modified) (1 diff)

libroar/vio.c

@@ -53 +53 @@
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
  calls->flags = ROAR_VIO_FLAGS_NONE;
- calls->refc  = 0;
+ calls->refc  = 1;
 
  return 0;
@@ -202 +202 @@
 }
 
-int     roar_vio_close    (struct roar_vio_calls * vio) {
+
+int     roar_vio_ref      (struct roar_vio_calls * vio) {
+ if ( vio == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ vio->refc++;
+
+ return 0;
+}
+
+int     roar_vio_unref    (struct roar_vio_calls * vio) {
  int ret;
 
- ROAR_DBG("roar_vio_close(vio=%p) = ?", vio);
-
- if ( vio == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- if ( vio->close == NULL ) {
+ ROAR_DBG("roar_vio_unref(vio=%p) = ?", vio);
+
+ if ( vio == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( vio->refc == 1 && vio->close == NULL ) {
   roar_err_set(ROAR_ERROR_NOSYS);
   return -1;
  }
+
+ vio->refc--;
+
+ if ( vio->refc )
+  return 0;
 
  roar_err_clear_all();
@@ -221 +238 @@
  roar_err_update();
 
+ if ( vio->flags & ROAR_VIO_FLAGS_FREESELF )
+  roar_mm_free(vio);
+
  return ret;
 }
@@ -257 +277 @@
 
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->read     = roar_vio_basic_read;
@@ -642 +664 @@
 
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->read     = roar_vio_pass_read;

libroar/vio_bio.c

@@ -42 +42 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->read     = roar_vio_bio_read;

libroar/vio_buffer.c

@@ -59 +59 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->inst     = self;

libroar/vio_buffer_store.c

@@ -50 +50 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  if ( inst != NULL )

libroar/vio_cmd.c

@@ -54 +54 @@
  // clear all
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
  memset(state, 0, sizeof(struct roar_vio_cmd_state));
 
@@ -233 +235 @@
  // clear all
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
  memset(state, 0, sizeof(struct roar_vio_2popen_state));
 

libroar/vio_dstr.c

@@ -411 +411 @@
 }
 
+struct roar_vio_calls * roar_vio_open_dstr_simple_new(const char * dstr, int o_flags) {
+ struct roar_vio_calls * ret = roar_mm_malloc(sizeof(struct roar_vio_calls));
+ int err;
+
+ if ( ret == NULL )
+  return NULL;
+
+ if ( roar_vio_open_dstr_simple(ret, dstr, o_flags) == -1 ) {
+  err = roar_error;
+  roar_mm_free(ret);
+  roar_error = err;
+  return NULL;
+ }
+
+ ret->flags |= ROAR_VIO_FLAGS_FREESELF;
+
+ return ret;
+}
+
 int     roar_vio_open_dstr    (struct roar_vio_calls * calls, const char * dstr, struct roar_vio_defaults * def, int dnum) {
  return roar_vio_open_dstr_vio(calls, dstr, def, dnum, NULL);

libroar/vio_jumbo.c

@@ -53 +53 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
  calls->inst     = self;
  calls->close    = roar_vio_jumbo_close;

libroar/vio_misc.c

@@ -106 +106 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
  calls->read     = roar_vio_misc_read;
  calls->write    = roar_vio_misc_write;

libroar/vio_pipe.c

@@ -125 +125 @@
 
  memset(s, 0, sizeof(struct roar_vio_calls));
+ s->flags    = ROAR_VIO_FLAGS_NONE;
+ s->refc     = 1;
 
  s->close    = roar_vio_pipe_close;

libroar/vio_rtp.c

@@ -110 +110 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->inst               = self;

libroar/vio_stack.c

@@ -56 +56 @@
  memset(self,  0, sizeof(struct roar_vio_stack));
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  self->free      = func;

libroar/vio_stdio.c

@@ -42 +42 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->read  = roar_vio_stdio_read;

libroar/vio_tantalos.c

@@ -97 +97 @@
    return 0;
 
-  memset(calls, 0, sizeof(*calls));
+  memset(calls, 0, sizeof(struct roar_vio_calls));
  }
 

libroar/vio_zlib.c

@@ -538 +538 @@
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags      = ROAR_VIO_FLAGS_NONE;
+ calls->refc       = 1;
 
  calls->inst       = self;