Simplify use of iconv for MARC records

[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..89dc9bb 100644 (file)
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, 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.27 2004-02-26 23:42:27 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -141,7 +141,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 +173,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(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);
@@ -194,7 +199,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,7 +209,11 @@ int Yaz_SocketManager::processEvent()
 
            yaz_log (m_log, "putEvent I/O mask=%d", mask);
        }
-       else if ((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);