Changeset 1257:0822da400485 in roaraudio

Timestamp:

02/27/09 02:58:17 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote a reader for vio cmd, fixed a bug forking at open even with ROAR_VIO_CMD_OPTS_ON_DEMAND

Files:

• include/libroar/vio_cmd.h (modified) (1 diff)
• libroar/vio_cmd.c (modified) (4 diffs)

include/libroar/vio_cmd.h

@@ -41 +41 @@
 #define ROAR_VIO_CMD_OPTS_NONBLOCK  0x01
 #define ROAR_VIO_CMD_OPTS_ON_DEMAND 0x02
+
+#define ROAR_VIO_CMD_BUFSIZE        1024
 
 struct roar_vio_cmd_child {

libroar/vio_cmd.c

@@ -78 +78 @@
  calls->inst = (void*) state;
 
- if ( reader != NULL )
-  if ( roar_vio_cmd_fork(&(state->reader)) == -1 )
-   return roar_vio_cmd_close(calls);
-
- if ( writer != NULL )
-  if ( roar_vio_cmd_fork(&(state->writer)) == -1 )
-   return roar_vio_cmd_close(calls);
+ if ( !(options & ROAR_VIO_CMD_OPTS_ON_DEMAND) ) {
+  if ( reader != NULL )
+   if ( roar_vio_cmd_fork(&(state->reader)) == -1 )
+    return roar_vio_cmd_close(calls);
+
+  if ( writer != NULL )
+   if ( roar_vio_cmd_fork(&(state->writer)) == -1 )
+    return roar_vio_cmd_close(calls);
+ }
 
  return 0;
@@ -195 +197 @@
 ssize_t roar_vio_cmd_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct roar_vio_cmd_state * state = (struct roar_vio_cmd_state *)vio->inst;
+ fd_set rfhs[1], wfhs[1];
+ struct timeval tv;
+ size_t done = 0;
+ int max_fh;
+ int ret;
+ char   tbuf[ROAR_VIO_CMD_BUFSIZE];
+ char * tp   = NULL;
+ size_t tlen = 0;
 
  if ( !state->reader.opened ) {
@@ -207 +217 @@
  }
 
- return -1;
+ while (done < count) {
+  if ( state->options & ROAR_VIO_CMD_OPTS_NONBLOCK ) {
+   tv.tv_sec  =    0;
+   tv.tv_usec =    1;
+  } else {
+   tv.tv_sec  = 3600;
+   tv.tv_usec =    0;
+  }
+
+  FD_ZERO(rfhs);
+  FD_ZERO(wfhs);
+
+  FD_SET(state->reader.in,  rfhs);
+  FD_SET(state->reader.out, wfhs);
+
+  max_fh = state->reader.in > state->reader.out ? state->reader.in : state->reader.out;
+
+  if ( (ret = select(max_fh + 1, rfhs, wfhs, rfhs, &tv)) == -1 )
+   return -1;
+
+  if ( ret > 0 ) {
+   if ( FD_ISSET(state->reader.in, rfhs) ) {
+    if ( (ret = read(state->reader.in, buf+done, count-done)) == -1 )
+     break;
+
+    if ( ret == 0 )
+     break;
+
+    done += ret;
+   }
+
+   if ( FD_ISSET(state->reader.out, wfhs) ) {
+    if ( !tlen ) {
+     tp = tbuf;
+     if ( (tlen = roar_vio_read(state->next, tp, ROAR_VIO_CMD_BUFSIZE)) == -1 )
+      tlen = 0;
+    }
+
+    if ( tlen ) {
+     if ( (ret = write(state->reader.out, tp, tlen)) > 0 ) {
+      tlen -= ret;
+      tp   += ret;
+     }
+    }
+   }
+  }
+
+  if ( state->options & ROAR_VIO_CMD_OPTS_NONBLOCK )
+   break;
+ }
+
+ if ( tlen ) { /* we have some data to write to the child... */
+  // TODO: try to write it out...
+  return -1;
+ }
+
+ return done;
 }
 
@@ -235 +301 @@
  if ( state == ROAR_SOCKET_BLOCK )
   self->options -= ROAR_VIO_CMD_OPTS_NONBLOCK;
+
+ roar_vio_nonblock(self->next, state); // this should help, but may not nessessery.
 
  return 0;