try to have the same behaviour reading from network on http/mms/pnm/rtsp.

select() is useful to avoid burning cpu cicles, otoh, we should not
call it after end of stream since it will hang xine for 30sec.
idea: do select() only on EAGAIN.
todo: unify these functions (?)

CVS patchset: 4105
CVS date: 2003/02/05 00:08:55

1 files changed, 17 insertions, 7 deletions

diff --git a/src/input/input_http.c b/src/input/input_http.c
index 9b21dde3d..05919863d 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -437,14 +437,24 @@ static off_t http_plugin_read (input_plugin_t *this_gen,
 
     /* read errors */
     if (n < 0) {
-      switch (errno) {
-      case EAGAIN:
-	xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: EAGAIN\n"));
-	continue;
-      default:
-	xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
-	return 0;
+      if(errno == EAGAIN) {
+        fd_set rset;
+        struct timeval timeout;
+    
+        FD_ZERO (&rset);
+        FD_SET  (this->fh, &rset);
+        
+        timeout.tv_sec  = 30;
+        timeout.tv_usec = 0;
+        
+        if (select (this->fh+1, &rset, NULL, NULL, &timeout) <= 0) {
+          xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: timeout\n"));
+          return 0;
+        }
+        continue;
       }
+      xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
+      return 0;
     }
     
     num_bytes += n;