Changeset 3042:4eeaa55d36c6 in roaraudio

Timestamp:

11/25/09 18:18:49 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote a _very_, _very_ experimental impl. of jumbo packets

Location:

roard

Files:

• include/streams.h (modified) (1 diff)
• streams.c (modified) (5 diffs)

roard/include/streams.h

@@ -81 +81 @@
  int state;
  struct roar_buffer * prethru;
+ struct roar_vio_calls jumbo;
+ struct roar_vio_calls * viop;
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/streams.c

@@ -121 +121 @@
 
    roar_vio_init_calls(&(s->vio));
+   roar_vio_init_calls(&(s->jumbo));
+   s->viop      = &(s->vio);
    s->driver_id = -1;
    s->flags     =  ROAR_FLAG_NONE;
@@ -243 +245 @@
 
  if ( !no_vio_close )
-  roar_vio_close(&(s->vio));
+  roar_vio_close(s->viop);
 
  prim = s->primary;
@@ -1482 +1484 @@
   return 0;
 
+ if ( g_config->jumbo_mtu )
+  roar_vio_sync(ss->viop);
+
  if ( streams_get_flag(id, ROAR_FLAG_PAUSE) )
   return 0;
@@ -1786 +1791 @@
       if ( g_streams[i]->state == ROAR_STREAMSTATE_NEW ) {
        if ( streams_get_flag(i, ROAR_FLAG_PRETHRU) == 1 ) {
-         if ( stream_prethru_send(i, ROAR_STREAM(stream)->id) == -1 ) {
+        if ( stream_prethru_send(i, ROAR_STREAM(stream)->id) == -1 ) {
          streams_delete(i);
         }
@@ -1804 +1809 @@
  }
 
- return roar_vio_write(&(stream->vio), buf, count);
+ if ( g_config->jumbo_mtu ) {
+  if ( stream->viop != &(stream->jumbo) ) {
+   if ( roar_vio_open_jumbo(&(stream->jumbo), &(stream->vio), g_config->jumbo_mtu) != -1 ) {
+    // if that works we continue using the jumbo vio,
+    // in case it didn't we dont, just use normal VIO.
+    stream->viop = &(stream->jumbo);
+   }
+  }
+ }
+
+ return roar_vio_write(stream->viop, buf, count);
 }