X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=dd61fb1ad1c90686e7cf548102a6ad080eac7252;hb=87be6c609c22d9620c781b95ab74298b63694055;hp=eeb06e2fc634be3462d6f05959618da12c172f3a;hpb=a8063bff74c6d48f7a0aec23c266894777e3134b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index eeb06e2..dd61fb1 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-socket-manager.cpp,v $
- * Revision 1.4  1999-03-23 14:17:57  adam
+ * 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
+ * Modified for new location of YAZ header files. Experimental threaded
+ * operation.
+ *
+ * Revision 1.7  1999/04/28 13:02:08  adam
+ * Added include of string.h.
+ *
+ * Revision 1.6  1999/04/21 12:09:01  adam
+ * Many improvements. Modified to proxy server to work with "sessions"
+ * based on cookies.
+ *
+ * Revision 1.5  1999/04/09 11:46:57  adam
+ * Added object Yaz_Z_Assoc. Much more functional client.
+ *
+ * Revision 1.4  1999/03/23 14:17:57  adam
  * More work on timeout handling. Work on yaz-client.
  *
  * Revision 1.3  1999/02/02 14:01:23  adam
@@ -27,8 +44,9 @@
 #include <unistd.h>
 #endif
 #include <errno.h>
+#include <string.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include <yaz-socket-manager.h>
 
 
@@ -110,6 +128,7 @@ int Yaz_SocketManager::processEvent()
     YazSocketEntry *p;
     YazSocketEvent *event = getEvent();
     unsigned timeout = 0;
+    logf (m_log, "processEvent");
     if (event)
     {
 	event->observer->socketNotify(event->event);
@@ -153,12 +172,18 @@ int Yaz_SocketManager::processEvent()
 	}
     }
     if (!no)
+    {
+	logf (m_log, "no pending events return 0");
+	if (!m_observers)
+	    logf (m_log, "no observers");
 	return 0;
+    }
 
     struct timeval to;
     to.tv_sec = timeout;
     to.tv_usec = 0;
-
+    
+    logf (m_log, "select pending=%d timeout=%d", no, timeout);
     while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0)
 	if (errno != EINTR)
 	    return -1;
@@ -184,9 +209,12 @@ int Yaz_SocketManager::processEvent()
 	    event->event = mask;
 	    putEvent (event);
 	}
-	else if (p->timeout && now >= p->last_activity + (int) (p->timeout))
+	else if (p->timeout && p->last_activity && 
+		 now >= p->last_activity + (int) (p->timeout))
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
+	    logf (LOG_LOG, "timeout now = %ld last_activity=%ld timeout=%d",
+		  now, p->last_activity, p->timeout);
 	    p->last_activity = now;
 	    event->observer = p->observer;
 	    event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
@@ -265,6 +293,7 @@ Yaz_SocketManager::Yaz_SocketManager()
     m_observers = 0;
     m_queue_front = 0;
     m_queue_back = 0;
+    m_log = LOG_DEBUG;
 }
 
 Yaz_SocketManager::~Yaz_SocketManager()