Changeset 5695:dd52b51afdfb in roaraudio

Timestamp:

10/13/12 23:28:54 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support diffrent strategy values.

File:

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

libroar/scheduler.c

@@ -164 +164 @@
 }
 
+static int __run_waits(struct roar_scheduler * sched) {
+ struct roar_scheduler_source * cur;
+ size_t i;
+ int ret = -1;
+
+ for (i = 0; ret == -1 && i < sched->sources_len; i++) {
+  if ( (cur = sched->sources[i]) == NULL )
+   continue;
+  switch (cur->type) {
+   case ROAR_SCHEDULER_PLUGIN:
+     ret = roar_dl_appsched_trigger(cur->lhandle, ROAR_DL_APPSCHED_WAIT);
+    break;
+   case ROAR_SCHEDULER_PLUGINCONTAINER:
+     ret = roar_plugincontainer_appsched_trigger(cur->handle.container, ROAR_DL_APPSCHED_WAIT);
+    break;
+#ifndef DEBUG
+   default: /* noop */ break;
+#endif
+  }
+ }
+
+ return ret;
+}
+
 // what to do?:
 // 0. get all VIOs.
@@ -171 +195 @@
 // 4. send UPDATE to all plugins and containers.
 int                     roar_scheduler_iterate(struct roar_scheduler * sched) {
+ enum roar_scheduler_strategy strategy;
  struct roar_vio_selecttv timeout = {8, 0}; // default: 8 sec. Just a random value.
  struct roar_scheduler_source * cur, * new_client;
@@ -178 +203 @@
  size_t i;
  int have_timeout = 0;
- size_t todo = 0;
+ size_t todo = 0, vios = 0;
  int tmp;
 
  _CHKSCHED(0);
+
+ strategy = sched->strategy;
+ if ( strategy == ROAR_SCHEDULER_STRATEGY_DEFAULT )
+  strategy = ROAR_SCHEDULER_STRATEGY_SELECTORWAIT;
 
  if ( sched->vios == NULL || sched->vios_len < sched->sources_len ) {
@@ -210 +239 @@
      ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), cur->vio, cur->handle.eventsq);
      todo++;
+     vios++;
     break;
    case ROAR_SCHEDULER_TIMEOUT:
@@ -219 +249 @@
      ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), cur->vio, ROAR_VIO_SELECT_READ);
      todo++;
+     vios++;
     break;
    case ROAR_SCHEDULER_CPI_CLIENT:
@@ -244 +275 @@
      ROAR_VIO_SELECT_SETVIO(&(sched->vios[i]), sched->sources[i]->vio, tmp);
      todo++;
+     vios++;
     break;
    case ROAR_SCHEDULER_PLUGIN:
@@ -260 +292 @@
  }
 
- ret = roar_vio_select(sched->vios, sched->vios_len, &timeout, NULL);
+ if ( strategy == ROAR_SCHEDULER_STRATEGY_WAITORSELECT || strategy == ROAR_SCHEDULER_STRATEGY_WAIT ) {
+  ret = __run_waits(sched);
+  if ( ret == 0 || strategy == ROAR_SCHEDULER_STRATEGY_WAIT )
+   ret = 1;
+ } else {
+  ret = -1;
+ }
+
+ if ( ret == -1 && !(strategy == ROAR_SCHEDULER_STRATEGY_SELECTORWAIT && vios == 0) ) {
+  ret = roar_vio_select(sched->vios, sched->vios_len, &timeout, NULL);
+ }
+
+ if ( ret < 0 && strategy == ROAR_SCHEDULER_STRATEGY_SELECTORWAIT ) {
+  ret = __run_waits(sched);
+  if ( ret == 0 )
+   ret = 1;
+ }
+
  if ( ret == -1 )
   return -1;