Changeset 1260:9d5611d31291 in roaraudio

Timestamp:

02/27/09 03:27:53 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got vio cmd reader working, :)

File:

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

libroar/vio_cmd.c

@@ -42 +42 @@
   return -1;
 
+/*
  if ( flags == 0 )
   return -1;
+*/
 
  if ( reader == NULL && writer == NULL )
@@ -50 +52 @@
  if ( (state = malloc(sizeof(struct roar_vio_cmd_state))) == NULL )
   return -1;
+
+ ROAR_DBG("roar_vio_open_cmd(*): pre reqs are OK");
 
  // clear all
@@ -76 +80 @@
 
  // init calls
- calls->inst = (void*) state;
+ calls->close    = roar_vio_cmd_close;
+ calls->read     = roar_vio_cmd_read;
+ calls->write    = roar_vio_cmd_write;
+ calls->nonblock = roar_vio_cmd_nonblock;
+ calls->sync     = roar_vio_cmd_sync;
+ calls->inst     = (void*) state;
+
+ ROAR_DBG("roar_vio_open_cmd(*): var setup OK");
 
  if ( !(options & ROAR_VIO_CMD_OPTS_ON_DEMAND) ) {
@@ -206 +217 @@
  size_t tlen = 0;
 
+ ROAR_DBG("roar_vio_cmd_read(*) = ?");
+
  if ( !state->reader.opened ) {
   if ( buf == NULL && count == 0 ) /* sync: no need to do anything if no reader is forked :) */
@@ -230 +243 @@
 
   FD_SET(state->reader.in,  rfhs);
-  FD_SET(state->reader.out, wfhs);
+
+  if ( state->reader.out != -1 ) {
+   FD_SET(state->reader.out, wfhs);
+  }
+
+#ifdef DEBUG
+  if ( FD_ISSET(state->reader.in, rfhs) ) {
+   ROAR_DBG("roar_vio_cmd_read(*): reader set in fh group");
+  }
+#endif
 
   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;
+  ROAR_DBG("roar_vio_cmd_read(*): max_fh=%i", max_fh);
+
+  if ( (ret = select(max_fh + 1, rfhs, wfhs, NULL, &tv)) == -1 )
+   return -1;
+
+  ROAR_DBG("roar_vio_cmd_read(*): select(*) = %i", ret);
+  ROAR_DBG("roar_vio_cmd_read(*): reader=%i, writer=%i", state->reader.in, state->reader.out);
 
   if ( ret > 0 ) {
    if ( FD_ISSET(state->reader.in, rfhs) ) {
+    ROAR_DBG("roar_vio_cmd_read(*): event on reader");
+
     if ( (ret = read(state->reader.in, buf+done, count-done)) == -1 )
      break;
@@ -248 +276 @@
    }
 
-   if ( FD_ISSET(state->reader.out, wfhs) ) {
+   if ( state->reader.out != -1 && FD_ISSET(state->reader.out, wfhs) ) {
+    ROAR_DBG("roar_vio_cmd_read(*): event on writer");
+
     if ( !tlen ) {
-     tp = tbuf;
+     tp   = tbuf;
+     tlen = 0;
      if ( (tlen = roar_vio_read(state->next, tp, ROAR_VIO_CMD_BUFSIZE)) == -1 )
-      tlen = 0;
+      continue;
     }
 
@@ -260 +291 @@
       tp   += ret;
      }
+    } else {
+     close(state->reader.out);
+     state->reader.out = -1;
     }
    }