disorder-speaker now treats read errors as equivalent to EOF (apart

from logging them) rather than calling disorder_fatal().
Should fix issue #51.

diff --git a/CHANGES.html b/CHANGES.html
index 96342895fdc43d4189e66afc991aa3c8ff072963..51cf92b59fdda7e9cc34dec0c1684a25dfe0e7ae 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -244,6 +244,11 @@ span.command {
           <td>Disobedience's 'When' column gets out of date</td>
         </tr>
 
           <td>Disobedience's 'When' column gets out of date</td>
         </tr>
 

+        <tr>
+          <td><a href="http://code.google.com/p/disorder/issues/detail?id=51">#51</a></td>
+          <td>Improved speaker process robustness</td>
+        </tr>
+

         <tr>
           <td>(none)</td>
          <td>&ldquo;found track in no collection&rdquo; messages for scratches
         <tr>
           <td>(none)</td>
          <td>&ldquo;found track in no collection&rdquo; messages for scratches

diff --git a/server/speaker.c b/server/speaker.c
index ccdf1e11aecff9115670a2dc46049ecd7bf7d294..a2c2e7c7650a8b45a7f5de5b0a406d5a360e1fca 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2005-2009 Richard Kettlewell
+ * Copyright (C) 2005-2010 Richard Kettlewell

  * Portions (C) 2007 Mark Wooding
  *
  * This program is free software: you can redistribute it and/or modify
  * Portions (C) 2007 Mark Wooding
  *
  * This program is free software: you can redistribute it and/or modify


@@ -316,12 +316,16 @@ static int speaker_fill(struct track *t) {
       n = read(t->fd, t->buffer + where, left);
     } while(n < 0 && errno == EINTR);
     pthread_mutex_lock(&lock);
       n = read(t->fd, t->buffer + where, left);
     } while(n < 0 && errno == EINTR);
     pthread_mutex_lock(&lock);

-    if(n < 0) {
-      if(errno != EAGAIN)
-        disorder_fatal(errno, "error reading sample stream");
+    if(n < 0 && errno == EAGAIN) {
+      /* EAGAIN means more later */

       rc = 0;
       rc = 0;

-    } else if(n == 0) {
-      D(("fill %s: eof detected", t->id));
+    } else if(n <= 0) {
+      /* n=0 means EOF.  n<0 means some error occurred.  We log the error but
+       * otherwise treat it as identical to EOF. */
+      if(n < 0)
+        disorder_error(errno, "error reading sample stream for %s", t->id);
+      else
+        D(("fill %s: eof detected", t->id));

       t->eof = 1;
       /* A track always becomes playable at EOF; we're not going to see any
        * more data. */
       t->eof = 1;
       /* A track always becomes playable at EOF; we're not going to see any
        * more data. */


@@ -521,7 +525,8 @@ static void mainloop(void) {
           D(("id %s fd %d", id, fd));
           t = findtrack(id, 1/*create*/);
           if (write(fd, "", 1) < 0)             /* write an ack */
           D(("id %s fd %d", id, fd));
           t = findtrack(id, 1/*create*/);
           if (write(fd, "", 1) < 0)             /* write an ack */

-            disorder_error(errno, "writing ack to inbound connection");
+            disorder_error(errno, "writing ack to inbound connection for %s",
+                           id);

           if(t->fd != -1) {
             disorder_error(0, "%s: already got a connection", id);
             xclose(fd);
           if(t->fd != -1) {
             disorder_error(0, "%s: already got a connection", id);
             xclose(fd);