Changeset 3767:9bfa5f13666f in roaraudio

Timestamp:

05/04/10 18:57:58 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added select like feature for VIOs

Files:

• include/libroar/vio_select.h (modified) (3 diffs)
• libroar/vio_select.c (modified) (1 diff)

include/libroar/vio_select.h

@@ -39 +39 @@
 #include "libroar.h"
 
-#define ROAR_VIO_SELECT_NONE        0x00
-#define ROAR_VIO_SELECT_READ        0x01
-#define ROAR_VIO_SELECT_WRITE       0x02
-#define ROAR_VIO_SELECT_EXCEPT      0x04
+#define ROAR_VIO_SELECT_NONE          0x00
+#define ROAR_VIO_SELECT_READ          0x01
+#define ROAR_VIO_SELECT_WRITE         0x02
+#define ROAR_VIO_SELECT_EXCEPT        0x04
+
+#define ROAR_VIO_SELECT_ACTION_NONE   0x00
+#define ROAR_VIO_SELECT_ACTION_SELECT 0x01
+#define ROAR_VIO_SELECT_ACTION_POLL   0x02
+#define ROAR_VIO_SELECT_ACTION_VIOS   0x04 /* VIO Select */
+
+#define ROAR_VIO_SELECT_SETVIO(d,v,q) ((d)->vio = (v)); ((d)->fh = -1); ((d)->eventsq = (q))
+#define ROAR_VIO_SELECT_SETSYSIO(d,f,q) ((d)->vio = NULL); ((d)->fh = (f)); ((d)->eventsq = (q))
 
 struct roar_vio_select_internal {
@@ -51 +59 @@
 struct roar_vio_select {
  struct roar_vio_calls * vio;
+ int fh;
  int eventsq;
  int eventsa;
+ union {
+  int    si;
+  void * vp;
+ } ud;
  struct roar_vio_select_internal internal;
 };
@@ -60 +73 @@
 };
 
+struct roar_vio_selecttv {
+ int64_t sec;
+ int32_t nsec;
+};
+
+ssize_t roar_vio_select(struct roar_vio_select * vios, size_t len, struct roar_vio_selecttv * rtv, struct roar_vio_selectctl * ctl);
+
 #endif
 

libroar/vio_select.c

@@ -36 +36 @@
 #include "libroar.h"
 
+ssize_t roar_vio_select(struct roar_vio_select * vios, size_t len, struct roar_vio_selecttv * rtv, struct roar_vio_selectctl * ctl) {
+ struct timeval tv;
+ size_t i;
+ int max_fh = -1;
+ int ret;
+ fd_set rfds, wfds, efds;
+
+ ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = ?", vios, (long long unsigned int)len, rtv, ctl);
+
+ if ( len == 0 ) {
+  ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = 0", vios, (long long unsigned int)len, rtv, ctl);
+  return 0;
+ }
+
+ if ( vios == NULL ) {
+  ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = -1", vios, (long long unsigned int)len, rtv, ctl);
+  return -1;
+ }
+
+ // pepaer interl structs:
+ for (i = 0; i < len; i++) {
+  if ( vios[i].fh == -1 ) {
+   vios[i].internal.action = ROAR_VIO_SELECT_ACTION_NONE;
+
+   if ( vios[i].eventsq & ROAR_VIO_SELECT_READ ) {
+    if ( roar_vio_ctl(vios[i].vio, ROAR_VIO_CTL_GET_SELECT_READ_FH, &(vios[i].internal.fh[0])) == -1 ) {
+     vios[i].internal.action |= ROAR_VIO_SELECT_ACTION_VIOS;
+     vios[i].internal.fh[0]   = -1;
+    } else {
+     vios[i].internal.action |= ROAR_VIO_SELECT_ACTION_SELECT;
+    }
+   }
+
+   if ( vios[i].eventsq & ROAR_VIO_SELECT_WRITE ) {
+    if ( roar_vio_ctl(vios[i].vio, ROAR_VIO_CTL_GET_SELECT_WRITE_FH, &(vios[i].internal.fh[1])) == -1 ) {
+     vios[i].internal.action |= ROAR_VIO_SELECT_ACTION_VIOS;
+     vios[i].internal.fh[1]   = -1;
+    } else {
+     vios[i].internal.action |= ROAR_VIO_SELECT_ACTION_SELECT;
+    }
+   }
+
+   if ( vios[i].eventsq & ROAR_VIO_SELECT_EXCEPT ) {
+    if ( roar_vio_ctl(vios[i].vio, ROAR_VIO_CTL_GET_SELECT_FH, &(vios[i].internal.fh[2])) == -1 ) {
+     vios[i].internal.action |= ROAR_VIO_SELECT_ACTION_VIOS;
+     vios[i].internal.fh[2]   = -1;
+    } else {
+     vios[i].internal.action |= ROAR_VIO_SELECT_ACTION_SELECT;
+    }
+   }
+  } else {
+   vios[i].internal.action = ROAR_VIO_SELECT_ACTION_SELECT;
+   vios[i].internal.fh[0]  = vios[i].fh;
+   vios[i].internal.fh[1]  = vios[i].fh;
+   vios[i].internal.fh[2]  = vios[i].fh;
+  }
+ }
+
+ // check:
+ for (i = 0; i < len; i++) {
+  if ( !( vios[i].internal.action == 0 || vios[i].internal.action == ROAR_VIO_SELECT_ACTION_SELECT ) ) {
+   // we currently do not support non-select selects.
+   // TODO: Fix this.
+   ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = -1", vios, (long long unsigned int)len, rtv, ctl);
+   return -1;
+  }
+ }
+
+ // prepaer fdsets:
+ FD_ZERO(&rfds);
+ FD_ZERO(&wfds);
+ FD_ZERO(&efds);
+
+ for (i = 0; i < len; i++) {
+  if ( vios[i].eventsq & ROAR_VIO_SELECT_READ ) {
+   FD_SET(vios[i].internal.fh[0], &rfds);
+   if ( vios[i].internal.fh[0] > max_fh )
+    max_fh = vios[i].internal.fh[0];
+  }
+
+  if ( vios[i].eventsq & ROAR_VIO_SELECT_WRITE ) {
+   FD_SET(vios[i].internal.fh[1], &wfds);
+   if ( vios[i].internal.fh[1] > max_fh )
+    max_fh = vios[i].internal.fh[1];
+  }
+
+  if ( vios[i].eventsq & ROAR_VIO_SELECT_EXCEPT ) {
+   FD_SET(vios[i].internal.fh[2], &efds);
+   if ( vios[i].internal.fh[2] > max_fh )
+    max_fh = vios[i].internal.fh[2];
+  }
+ }
+
+ // the the select:
+  if ( rtv == NULL ) {
+   tv.tv_sec  = 1024;
+   tv.tv_usec = 0;
+  } else {
+   tv.tv_sec  = rtv->sec;
+   tv.tv_usec = rtv->nsec / 1000;
+  }
+
+ ret = select(max_fh + 1, &rfds, &wfds, &efds, &tv);
+
+ // ret == -1 -> Error
+ // ret ==  0 -> No data
+ if ( ret < 1 )
+  return ret;
+
+ // set eventsa:
+ for (i = 0; i < len; i++) {
+  vios[i].eventsa = ROAR_VIO_SELECT_NONE;
+
+  if ( vios[i].eventsq & ROAR_VIO_SELECT_READ )
+   if ( FD_ISSET(vios[i].internal.fh[0], &rfds) )
+    vios[i].eventsa |= ROAR_VIO_SELECT_READ;
+
+  if ( vios[i].eventsq & ROAR_VIO_SELECT_WRITE )
+   if ( FD_ISSET(vios[i].internal.fh[1], &wfds) )
+    vios[i].eventsa |= ROAR_VIO_SELECT_WRITE;
+
+  if ( vios[i].eventsq & ROAR_VIO_SELECT_EXCEPT )
+   if ( FD_ISSET(vios[i].internal.fh[2], &efds) )
+    vios[i].eventsa |= ROAR_VIO_SELECT_EXCEPT;
+ }
+
+ ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = %lli", vios, (long long unsigned int)len, rtv, ctl, (long long int)ret);
+ return ret;
+}
+
 //ll