X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=89dc9bbf696719401cd43694892c1dcafe88b725;hb=d3d51bee2100324025f7530d4e3ff3502397fd83;hp=82bc0a38819b905ec8d3c7e2348baca1f9208c0f;hpb=f7bb8a2528c7c1552ba255388eb246267c252250;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 82bc0a3..89dc9bb 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.22 2003-12-16 11:26:42 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.27 2004-02-26 23:42:27 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -44,7 +44,7 @@ void Yaz_SocketManager::addObserver(int fd, IYazSocketObserver *observer)
     se->fd = fd;
     se->mask = 0;
     se->last_activity = 0;
-    se->timeout = 0;
+    se->timeout = -1;
 }
 
 void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer)
@@ -87,7 +87,7 @@ void Yaz_SocketManager::maskObserver(IYazSocketObserver *observer, int mask)
 }
 
 void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer,
-					unsigned timeout)
+					int timeout)
 {
     YazSocketEntry *se;
 
@@ -100,7 +100,7 @@ int Yaz_SocketManager::processEvent()
 {
     YazSocketEntry *p;
     YazSocketEvent *event = getEvent();
-    unsigned timeout = 0;
+    int timeout = -1;
     yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
     if (event)
     {
@@ -141,17 +141,18 @@ int Yaz_SocketManager::processEvent()
         }
 	if (fd > max)
 	    max = fd;
-	if (p->timeout)
+	if (p->timeout > 0 ||
+	    (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
 	{
-	    unsigned timeout_this;
+	    int timeout_this;
 	    timeout_this = p->timeout;
 	    if (p->last_activity)
 		timeout_this -= now - p->last_activity;
 	    else
 		p->last_activity = now;
-	    if (timeout_this < 1 || timeout_this > 2147483646)
-		timeout_this = 1;
-	    if (!timeout || timeout_this < timeout)
+	    if (timeout_this < 0 || timeout_this > 2147483646)
+		timeout_this = 0;
+	    if (timeout == -1 || timeout_this < timeout)
 		timeout = timeout_this;
             p->timeout_this = timeout_this;
             yaz_log (m_log, "Yaz_SocketManager::select timeout_this=%d", 
@@ -172,12 +173,18 @@ int Yaz_SocketManager::processEvent()
     
     yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
              no, timeout);
-    while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0)
+    int pass = 0;
+    while ((res = select(max + 1, &in, &out, &except,
+			 timeout== -1 ? 0 : &to)) < 0)
 	if (errno != EINTR)
 	{
-	    yaz_log (LOG_LOG|LOG_WARN, "select");
-	    return -1;
+	    yaz_log(LOG_ERRNO|LOG_WARN, "select");
+	    yaz_log(LOG_WARN, "errno=%d max=%d timeout=%d",
+			     errno, max, timeout);
+	    if (++pass > 10)
+	        return -1;
 	}
+    yaz_log(m_log, "select returned res=%d", res);
     now = time(0);
     for (p = m_observers; p; p = p->next)
     {
@@ -202,7 +209,11 @@ int Yaz_SocketManager::processEvent()
 
 	    yaz_log (m_log, "putEvent I/O mask=%d", mask);
 	}
-	else if (p->timeout && (now - p->last_activity) >= p->timeout)
+	else if (
+	    (p->timeout > 0 ||
+	     (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
+	    &&
+	    (now - p->last_activity) >= p->timeout)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);