Changeset 498:0c066d1a1842 in roaraudio

Timestamp:

08/14/08 06:06:02 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added simple code to speed up non-stream connections

Files:

• include/roaraudio/proto.h (modified) (1 diff)
• roard/clients.c (modified) (8 diffs)
• roard/req.c (modified) (1 diff)

include/roaraudio/proto.h

@@ -50 +50 @@
 
 
+#define ROAR_CMD_OK_STOP      253
 #define ROAR_CMD_OK           254 /* return value OK */
 #define ROAR_CMD_ERROR        255 /* return value ERROR */

roard/clients.c

@@ -130 +130 @@
 }
 
+#define MAX_STREAMLESS 8
+
 int clients_check_all (void) {
  struct timeval tv;
@@ -138 +140 @@
  int max_fh = -1;
  int have = 0;
+ struct {
+  int id;
+  int fh;
+ } streamless[MAX_STREAMLESS];
+ int have_streamless = 0;
+ int have_stream;
 
  FD_ZERO(&r);
@@ -158 +166 @@
     max_fh = fh;
   }
+
+  have_stream = 0;
 
   for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
@@ -165 +175 @@
     if ( fh > max_fh )
      max_fh = fh;
+
+    have_stream = 1;
    }
    //printf("D: client=%i, stream=%i, fh=%i\n", i, j, fh);
   }
 
+  if ( !have_stream && have_streamless < MAX_STREAMLESS ) {
+   streamless[have_streamless  ].id = i;
+   if ( (streamless[have_streamless++].fh = g_clients[i]->fh) == -1 )
+    have_streamless--;
+  }
  }
 
@@ -214 +231 @@
  }
 
+ if ( have_streamless ) {
+   FD_ZERO(&r);
+
+   tv.tv_sec  = 0;
+   tv.tv_usec = 1;
+
+   max_fh = -1;
+
+   for (i = 0; i < have_streamless; i++) {
+    fh = streamless[i].fh;
+
+    ROAR_DBG("clients_check_all(void): fh=%i", fh);
+    FD_SET(fh, &r);
+
+    if ( fh > max_fh )
+     max_fh = fh;
+   }
+
+   if ( (ret = select(max_fh + 1, &r, NULL, NULL, &tv)) < 0 ) {
+    return ret;
+   }
+
+   for (i = 0; i < have_streamless; i++) {
+    if ( FD_ISSET(streamless[i].fh, &r) ) {
+     clients_check(streamless[i].id);
+    }
+   }
+ }
+
  ROAR_DBG("clients_check_all(void) = %i // have value", have);
  return have;
@@ -224 +270 @@
  int oldcmd;
  int r;
+ int rv = 0;
 
  if ( g_clients[id] == NULL )
@@ -251 +298 @@
    m.cmd     = ROAR_CMD_OK;
    m.datalen = 0;
+  } else if ( m.cmd == ROAR_CMD_OK_STOP ) {
+   m.cmd     = ROAR_CMD_OK;
+   rv        = 1;
   }
  }
@@ -260 +310 @@
 
  ROAR_DBG("clients_check(id=%i) = 0", id);
- return 0;
+ return rv;
 }
 

roard/req.c

@@ -591 +591 @@
  }
 
- mes->cmd     = ROAR_CMD_OK;
+ mes->cmd     = ROAR_CMD_OK_STOP;
  mes->datalen = 0;