Changeset 71:6426d93defd0 in roaraudio

Timestamp:

07/12/08 15:07:26 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to quit the server if all clients are gone and we are in --no-listen mode

Files:

• libroar/socket.c (modified) (1 diff)
• roard/clients.c (modified) (5 diffs)
• roard/include/roard.h (modified) (1 diff)
• roard/loop.c (modified) (1 diff)
• roard/roard.c (modified) (2 diffs)

libroar/socket.c

@@ -167 +167 @@
   snprintf(fhstr, 7, "%i", socks[1]);
 
-  execlp("roard", "roard", "--no-listen", "--client-fh", fhstr, NULL);
+  execlp("roard", "roard", "--terminate", "--no-listen", "--client-fh", fhstr, NULL);
 
   // we are still alive?

roard/clients.c

@@ -115 +115 @@
  int fh;
  int max_fh = -1;
+ int have = 0;
 
  FD_ZERO(&r);
@@ -127 +128 @@
 
   if ( (fh = g_clients[i]->fh) != -1 ) {
+   have++;
+
    FD_SET(fh, &r);
    FD_SET(fh, &e);
@@ -147 +150 @@
 
  if ( (ret = select(max_fh + 1, &r, NULL, &e, &tv)) < 1 ) {
-  return ret;
+  return ret < 0 ? ret : have;
  }
 
@@ -155 +158 @@
 
   if ( (fh = g_clients[i]->fh) != -1 ) {
-
    if ( FD_ISSET(fh, &r) ) {
     if ( g_clients[i]->execed == -1 ) {
@@ -177 +179 @@
  }
 
- return 0;
+ ROAR_DBG("clients_check_all(void) = %i // have value", have);
+ return have;
 }
 

roard/include/roard.h

@@ -34 +34 @@
 int g_self_client;
 
+int g_terminate;
+
 struct roar_audio_info * g_sa;
 

roard/loop.c

@@ -31 +31 @@
 
   ROAR_DBG("main_loop(*): check for new data...");
-  clients_check_all();
+  if ( clients_check_all() == 0 && g_terminate && g_listen_socket == -1 )
+   alive = 0;
 
   ROAR_DBG("main_loop(*): mixing clients...");

roard/roard.c

@@ -10 +10 @@
  printf("Misc Options:\n\n");
  printf(
-        " --demon               - bring the server into background after init\n"
+        " --demon               - Bring the server into background after init\n"
+        " --terminate           - Terminate after last client quited\n"
        );
 
@@ -120 +121 @@
   } else if ( strcmp(k, "--demon") == 0 ) {
    demon = 1;
+  } else if ( strcmp(k, "--terminate") == 0 ) {
+   g_terminate = 1;
 
   } else if ( strcmp(k, "-R") == 0 || strcmp(k, "--rate") == 0 ) {