Changeset 5276:0eb24ca6810e in roaraudio for libroar/vio_pipe.c

Timestamp:

11/20/11 18:36:49 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

merged VIO's _nonblock() into _ctl() (Closes: #135)

File:

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

libroar/vio_pipe.c

@@ -119 +119 @@
 #ifndef ROAR_WITHOUT_VIO_PIPE
 int roar_vio_pipe_init (struct roar_vio_calls * s,  struct roar_vio_pipe * self, int flags) {
+ int nonblock = ROAR_SOCKET_NONBLOCK;
+
  if ( s == NULL || self == NULL )
   return -1;
@@ -127 +129 @@
  s->read     = roar_vio_pipe_read;
  s->write    = roar_vio_pipe_write;
- s->nonblock = roar_vio_pipe_nonblock;
  s->sync     = roar_vio_pipe_sync;
 
@@ -133 +134 @@
 
  if ( flags & O_NONBLOCK ) {
-  roar_vio_pipe_nonblock(s, ROAR_SOCKET_NONBLOCK);
+  roar_vio_pipe_ctl(s, ROAR_VIO_CTL_NONBLOCK, &nonblock);
  }
 
@@ -187 +188 @@
 }
 
-int     roar_vio_pipe_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_vio_pipe * self;
-
- if ( vio == NULL )
-  return -1;
-
- if ( (self = (struct roar_vio_pipe *)vio->inst) == NULL )
-  return -1;
-
- switch (self->type) {
-  case ROAR_VIO_PIPE_TYPE_PIPE:
-    if ( roar_socket_nonblock(self->b.p[ROAR_VIO_PIPE_S(self,vio)*2], state) == -1 )
-     return -1;
-    return roar_socket_nonblock(self->b.p[(ROAR_VIO_PIPE_SR(self,vio)*2)+1], state);
-   break;
-#ifdef ROAR_HAVE_UNIX
-  case ROAR_VIO_PIPE_TYPE_SOCKET:
-    return roar_socket_nonblock(self->b.p[ROAR_VIO_PIPE_S(self,vio)], state);
-   break;
-#endif
- }
-
- return -1;
-}
-
 int     roar_vio_pipe_sync    (struct roar_vio_calls * vio) {
  // we may add fdatasync() calls here depending on the type
@@ -276 +252 @@
        return 0;
       break;
+    }
+   break;
+  case ROAR_VIO_CTL_NONBLOCK:
+    switch (self->type) {
+     case ROAR_VIO_PIPE_TYPE_PIPE:
+       if ( roar_socket_nonblock(self->b.p[ROAR_VIO_PIPE_S(self,vio)*2], *(int*)data) == -1 )
+        return -1;
+       return roar_socket_nonblock(self->b.p[(ROAR_VIO_PIPE_SR(self,vio)*2)+1], *(int*)data);
+      break;
+#ifdef ROAR_HAVE_UNIX
+     case ROAR_VIO_PIPE_TYPE_SOCKET:
+       return roar_socket_nonblock(self->b.p[ROAR_VIO_PIPE_S(self,vio)], *(int*)data);
+      break;
+#endif
     }
    break;