X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=ad92a08f9d270c4b35e4aca5502ec43c8ecb659a;hb=39d361df694b13d711bbb1ad2f61b18a8b68caf9;hp=1eb8c5c1f62e19d5994ef9fc9c8b1cefc373d2e7;hpb=94881bc56aff2b24ead75ac5f9e14128570cf311;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 1eb8c5c..ad92a08 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.18 2001-12-21 10:50:22 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.21 2003-12-16 11:26:14 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include <yaz/log.h>
-#include <yaz++/yaz-socket-manager.h>
+#include <yaz++/socket-manager.h>
 
 Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
     IYazSocketObserver *observer)
@@ -76,6 +76,11 @@ 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;
@@ -194,12 +199,14 @@ 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 (p->timeout && (now - p->last_activity) >= p->timeout)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);
-	    yaz_log (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
+	    yaz_log (m_log, "putEvent timeout, now = %ld last_activity=%ld timeout=%d",
                      now, p->last_activity, p->timeout);
 	    p->last_activity = now;
 	    event->observer = p->observer;