No SIGPIPES in windows...

[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 dd61fb1..a64b9bc 100644 (file)
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,10 +1,26 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-socket-manager.cpp,v $
- * Revision 1.9  2000-08-07 14:19:59  adam
+ * Revision 1.14  2000-11-20 14:17:36  adam
+ * Yet another WIN32 fix for connect notify.
+ *
+ * Revision 1.13  2000/11/20 11:27:33  adam
+ * Fixes for connect operation (timeout and notify fix).
+ *
+ * Revision 1.12  2000/10/24 12:29:57  adam
+ * Fixed bug in proxy where a Yaz_ProxyClient could be owned by
+ * two Yaz_Proxy's (fatal).
+ *
+ * Revision 1.11  2000/10/11 11:58:17  adam
+ * Moved header files to include/yaz++. Switched to libtool and automake.
+ * Configure script creates yaz++-config script.
+ *
+ * Revision 1.10  2000/09/08 10:23:42  adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.9  2000/08/07 14:19:59  adam
  * Fixed serious bug regarding timeouts. Improved logging for proxy.
  *
  * Revision 1.8  1999/12/06 13:52:45  adam
@@ -47,8 +63,7 @@
 #include <string.h>
 
 #include <yaz/log.h>
-#include <yaz-socket-manager.h>
-
+#include <yaz++/yaz-socket-manager.h>
 
 Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
     IYazSocketObserver *observer)
@@ -152,11 +167,20 @@ int Yaz_SocketManager::processEvent()
        if (p->mask)
            no++;
        if (p->mask & YAZ_SOCKET_OBSERVE_READ)
+        {
+            yaz_log (m_log, "select fd=%d: read fd", fd);
            FD_SET(fd, &in);
+        }
        if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
+        {
+            yaz_log (m_log, "select fd=%d: write fd", fd);
            FD_SET(fd, &out);
+        }
        if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
+        {
+            yaz_log (m_log, "select fd=%d: except fd", fd);
            FD_SET(fd, &except);
+        }
        if (fd > max)
            max = fd;
        if (p->timeout)
@@ -165,6 +189,8 @@ int Yaz_SocketManager::processEvent()
            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)
@@ -213,7 +239,7 @@ int Yaz_SocketManager::processEvent()
                 now >= p->last_activity + (int) (p->timeout))
        {
            YazSocketEvent *event = new YazSocketEvent;
-           logf (LOG_LOG, "timeout now = %ld last_activity=%ld timeout=%d",
+           logf (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
                  now, p->last_activity, p->timeout);
            p->last_activity = now;
            event->observer = p->observer;
@@ -230,6 +256,10 @@ int Yaz_SocketManager::processEvent()
     return 0;
 }
 
+
+//    n p    n p  ......   n p    n p
+//   front                        back
+
 void Yaz_SocketManager::putEvent(YazSocketEvent *event)
 {
     // put in back of queue