Changeset 5697:f3a6f503e20e in roaraudio

Timestamp:

10/14/12 00:11:34 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

allow CPI stubs

File:

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

libroar/scheduler.c

@@ -58 +58 @@
 };
 
+static int __update_cpi_listen_client (struct roar_scheduler * sched, struct roar_scheduler_source * source);
+
 struct roar_scheduler * roar_scheduler_new(int flags, enum roar_scheduler_strategy strategy) {
  struct roar_scheduler * sched = roar_mm_malloc(sizeof(struct roar_scheduler));
@@ -247 +249 @@
     break;
    case ROAR_SCHEDULER_CPI_LISTEN:
-     ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), cur->vio, ROAR_VIO_SELECT_READ);
-     todo++;
-     vios++;
+     if ( cur->flags & ROAR_SCHEDULER_FLAG_STUB )
+      __update_cpi_listen_client(sched, cur);
+
+     if ( !(cur->flags & ROAR_SCHEDULER_FLAG_STUB) ) {
+      ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), cur->vio, ROAR_VIO_SELECT_READ);
+      todo++;
+      vios++;
+     }
     break;
    case ROAR_SCHEDULER_CPI_CLIENT:
-     tmp = 0;
-
-     if ( cur->handle.cpi.impl->status != NULL ) {
-      if ( cur->lhandle != NULL )
-       roar_dl_context_restore(cur->lhandle);
-
-      para = roar_dl_getpara(cur->lhandle);
-      if ( cur->handle.cpi.impl->status(cur->handle.cpi.client, cur->vio, &(cur->handle.cpi.obuffer), &(cur->handle.cpi.userdata), cur->handle.cpi.protopara, cur->handle.cpi.protoparalen, para) & ROAR_DL_PROTO_STATUS_RX_READY )
+     if ( cur->flags & ROAR_SCHEDULER_FLAG_STUB )
+      __update_cpi_listen_client(sched, cur);
+
+     if ( !(cur->flags & ROAR_SCHEDULER_FLAG_STUB) ) {
+      tmp = 0;
+
+      if ( cur->handle.cpi.impl->status != NULL ) {
+       if ( cur->lhandle != NULL )
+        roar_dl_context_restore(cur->lhandle);
+
+       para = roar_dl_getpara(cur->lhandle);
+       if ( cur->handle.cpi.impl->status(cur->handle.cpi.client, cur->vio, &(cur->handle.cpi.obuffer), &(cur->handle.cpi.userdata), cur->handle.cpi.protopara, cur->handle.cpi.protoparalen, para) & ROAR_DL_PROTO_STATUS_RX_READY )
+        tmp |= ROAR_VIO_SELECT_READ;
+       if ( para != NULL )
+        roar_dl_para_unref(para);
+
+       if ( cur->lhandle != NULL )
+        roar_dl_context_store(cur->lhandle);
+      } else {
        tmp |= ROAR_VIO_SELECT_READ;
-      if ( para != NULL )
-       roar_dl_para_unref(para);
-
-      if ( cur->lhandle != NULL )
-       roar_dl_context_store(cur->lhandle);
-     } else {
-      tmp |= ROAR_VIO_SELECT_READ;
-     }
-
-     if ( sched->sources[i]->handle.cpi.obuffer != NULL )
-      tmp |= ROAR_VIO_SELECT_WRITE;
-
-     ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), sched->sources[i]->vio, tmp);
-     todo++;
-     vios++;
+      }
+
+      if ( sched->sources[i]->handle.cpi.obuffer != NULL )
+       tmp |= ROAR_VIO_SELECT_WRITE;
+
+      ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), sched->sources[i]->vio, tmp);
+      todo++;
+      vios++;
+     }
     break;
    case ROAR_SCHEDULER_PLUGIN:
@@ -342 +354 @@
       continue;
 
+     if ( cur->flags & ROAR_SCHEDULER_FLAG_STUB )
+      continue;
+
      if ( cur->cb != NULL )
       cur->cb(sched->sources[i], sched->sources[i]->userdata, sched->vios[i].eventsa);
@@ -391 +406 @@
    case ROAR_SCHEDULER_CPI_CLIENT:
      if ( !sched->vios[i].eventsa )
+      continue;
+
+     if ( cur->flags & ROAR_SCHEDULER_FLAG_STUB )
       continue;
 
@@ -572 +590 @@
  }
 
- if ( source->handle.cpi.proto > 0 && source->handle.cpi.impl != NULL )
+ if ( source->handle.cpi.proto > 0 ) {
+  source->flags |= ROAR_SCHEDULER_FLAG_STUB;
+  if ( source->handle.cpi.impl == NULL )
+   return 0;
+  source->flags -= ROAR_SCHEDULER_FLAG_STUB;
   return 0;
+ }
 
  roar_err_set(ROAR_ERROR_INVAL);