X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=d95192670a2906f8397d5ee4059db422465fd405;hb=e55896f9cb43034c3e8743b51ef79936f5404bc3;hp=376a079dfd5a56358b757e692835935cdcebaab5;hpb=86433d4fcd24b068f362aecf0b1d1666d32ac6a1;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 376a079..d951926 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -3,7 +3,19 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-socket-manager.cpp,v $
- * Revision 1.12  2000-10-24 12:29:57  adam
+ * Revision 1.16  2001-08-13 16:39:12  adam
+ * PDU_Assoc keeps track of children. Using yaz_log instead of logf.
+ *
+ * Revision 1.15  2001/03/26 14:43:49  adam
+ * New threaded PDU association.
+ *
+ * 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).
  *
@@ -137,7 +149,7 @@ int Yaz_SocketManager::processEvent()
     YazSocketEntry *p;
     YazSocketEvent *event = getEvent();
     unsigned timeout = 0;
-    logf (m_log, "processEvent");
+    yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
     if (event)
     {
 	event->observer->socketNotify(event->event);
@@ -161,11 +173,20 @@ int Yaz_SocketManager::processEvent()
 	if (p->mask)
 	    no++;
 	if (p->mask & YAZ_SOCKET_OBSERVE_READ)
+        {
+            yaz_log (m_log, "Yaz_SocketManager::select fd=%d read", fd);
 	    FD_SET(fd, &in);
+        }
 	if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
+        {
+            yaz_log (m_log, "Yaz_SocketManager::select fd=%d write", fd);
 	    FD_SET(fd, &out);
+        }
 	if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
+        {
+            yaz_log (m_log, "Yaz_SocketManager::select fd=%d except", fd);
 	    FD_SET(fd, &except);
+        }
 	if (fd > max)
 	    max = fd;
 	if (p->timeout)
@@ -174,6 +195,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)
@@ -182,9 +205,9 @@ int Yaz_SocketManager::processEvent()
     }
     if (!no)
     {
-	logf (m_log, "no pending events return 0");
+	yaz_log (m_log, "no pending events return 0");
 	if (!m_observers)
-	    logf (m_log, "no observers");
+	    yaz_log (m_log, "no observers");
 	return 0;
     }
 
@@ -192,7 +215,7 @@ int Yaz_SocketManager::processEvent()
     to.tv_sec = timeout;
     to.tv_usec = 0;
     
-    logf (m_log, "select pending=%d timeout=%d", no, timeout);
+    yaz_log (m_log, "Yaz_SocketManager::select no=%d timeout=%d", no, timeout);
     while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0)
 	if (errno != EINTR)
 	    return -1;
@@ -222,7 +245,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",
+	    yaz_log (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
 		  now, p->last_activity, p->timeout);
 	    p->last_activity = now;
 	    event->observer = p->observer;