Updates for yaz/ylog.h

[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 5f0f7df..11d34e9 100644 (file)
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.17 2001-11-04 22:36:21 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.29 2004-11-30 21:10:31 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -15,8 +15,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <yaz/log.h>
-#include <yaz++/yaz-socket-manager.h>
+#include <yaz/ylog.h>
+#include <yaz++/socket-manager.h>
 
 Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
     IYazSocketObserver *observer)
@@ -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)
@@ -76,13 +76,18 @@ void Yaz_SocketManager::maskObserver(IYazSocketObserver *observer, int mask)
 {
     YazSocketEntry *se;
 
+    yaz_log(m_log, "obs=%p read=%d write=%d except=%d", observer,
+                   mask & YAZ_SOCKET_OBSERVE_READ,
+                   mask & YAZ_SOCKET_OBSERVE_WRITE,
+                   mask & YAZ_SOCKET_OBSERVE_EXCEPT);
+
     se = *lookupObserver(observer);
     if (se)
        se->mask = mask;
 }
 
 void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer,
-                                       unsigned timeout)
+                                       int timeout)
 {
     YazSocketEntry *se;
 
@@ -95,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)
     {
@@ -136,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 = 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", 
@@ -167,9 +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)
-           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);
     for (p = m_observers; p; p = p->next)
     {
@@ -191,13 +206,15 @@ int Yaz_SocketManager::processEvent()
            event->observer = p->observer;
            event->event = mask;
            putEvent (event);
+
+           yaz_log (m_log, "putEvent I/O mask=%d", mask);
        }
-       else if (res == 0 && p->timeout && p->timeout_this == timeout)
+       else if (res == 0 && p->timeout_this == timeout)
        {
            YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);
-           yaz_log (m_log, "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;
@@ -210,7 +227,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;
 }
 
@@ -281,7 +298,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()