Handle present out of range better in sample server.

[yazpp-moved-to-github.git] / src / yaz-socket-manager.cpp

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 0094e1d..4a75923 100644 (file)
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,19 +1,26 @@
 /*
- * Copyright (c) 1998-2004, Index Data.
+ * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.25 2004-01-30 00:38:28 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.31 2005-01-14 10:13:50 adam Exp $
  */
-#include <assert.h>
 #ifdef WIN32
 #include <winsock.h>
-#else
+#endif
+
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
 #include <errno.h>
 #include <string.h>
+#include <assert.h>
 
 #include <yaz/log.h>
 #include <yaz++/socket-manager.h>
@@ -141,7 +148,8 @@ int Yaz_SocketManager::processEvent()
         }
        if (fd > max)
            max = fd;
-       if (p->timeout >= 0)
+       if (p->timeout > 0 ||
+           (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
        {
            int timeout_this;
            timeout_this = p->timeout;
@@ -172,12 +180,16 @@ int Yaz_SocketManager::processEvent()
     
     yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
              no, timeout);
+    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(YLOG_ERRNO|YLOG_WARN, "select");
+           yaz_log(YLOG_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);
@@ -194,7 +206,7 @@ int Yaz_SocketManager::processEvent()
        if (FD_ISSET(fd, &except))
            mask |= YAZ_SOCKET_OBSERVE_EXCEPT;
        
-       if (res > 0 && mask)
+       if (mask)
        {
            YazSocketEvent *event = new YazSocketEvent;
            p->last_activity = now;
@@ -204,12 +216,12 @@ int Yaz_SocketManager::processEvent()
 
            yaz_log (m_log, "putEvent I/O mask=%d", mask);
        }
-       else if ((now - p->last_activity) >= p->timeout)
+       else if (res == 0 && p->timeout_this == timeout)
        {
            YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);
-           yaz_log (m_log, "putEvent timeout, now = %ld last_activity=%ld timeout=%d",
-                     now, p->last_activity, p->timeout);
+           yaz_log (m_log, "putEvent timeout fd=%d, now = %ld last_activity=%ld timeout=%d",
+                     p->fd, now, p->last_activity, p->timeout);
            p->last_activity = now;
            event->observer = p->observer;
            event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
@@ -222,7 +234,7 @@ int Yaz_SocketManager::processEvent()
        delete event;
        return 1;
     }
-    yaz_log (LOG_WARN, "unhandled event in processEvent");
+    yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res);
     return 1;
 }
 
@@ -293,7 +305,7 @@ Yaz_SocketManager::Yaz_SocketManager()
     m_observers = 0;
     m_queue_front = 0;
     m_queue_back = 0;
-    m_log = LOG_DEBUG;
+    m_log = YLOG_DEBUG;
 }
 
 Yaz_SocketManager::~Yaz_SocketManager()