X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=536c5b6cf6f7c04e7c308f4eb9552911cdf601ba;hb=b3d26248b0c906f1a487d65aae5a2a33d91e8fde;hp=7988dca1417602dd3c20ee8e3fcab23261ac9b71;hpb=5c45ffbb2b430a6f41277c303a5e9b94242dab96;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 7988dca..536c5b6 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,29 +1,8 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
- * $Log: yaz-socket-manager.cpp,v $
- * 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
- * First WIN32 port of YAZ++.
- *
- * Revision 1.2  1999/01/28 13:08:48  adam
- * Yaz_PDU_Assoc better encapsulated. Memory leak fix in
- * yaz-socket-manager.cc.
- *
- * Revision 1.1.1.1  1999/01/28 09:41:07  adam
- * First implementation of YAZ++.
- *
+ * $Id: yaz-socket-manager.cpp,v 1.19 2002-10-09 12:50:26 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -34,10 +13,10 @@
 #include <unistd.h>
 #endif
 #include <errno.h>
+#include <string.h>
 
-#include <log.h>
-#include <yaz-socket-manager.h>
-
+#include <yaz/log.h>
+#include <yaz++/socket-manager.h>
 
 Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
     IYazSocketObserver *observer)
@@ -117,7 +96,7 @@ int Yaz_SocketManager::processEvent()
     YazSocketEntry *p;
     YazSocketEvent *event = getEvent();
     unsigned timeout = 0;
-    logf (LOG_LOG, "processEvent");
+    yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
     if (event)
     {
 	event->observer->socketNotify(event->event);
@@ -141,11 +120,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)
@@ -154,17 +142,22 @@ int Yaz_SocketManager::processEvent()
 	    timeout_this = p->timeout;
 	    if (p->last_activity)
 		timeout_this -= now - p->last_activity;
-	    if (timeout_this < 1)
+	    else
+		p->last_activity = now;
+	    if (timeout_this < 1 || timeout_this > 2147483646)
 		timeout_this = 1;
 	    if (!timeout || timeout_this < timeout)
 		timeout = timeout_this;
+            p->timeout_this = timeout_this;
+            yaz_log (m_log, "Yaz_SocketManager::select timeout_this=%d", 
+                     p->timeout_this);
 	}
     }
     if (!no)
     {
-	logf (LOG_LOG, "no pending events return 0");
+	yaz_log (m_log, "no pending events return 0");
 	if (!m_observers)
-	    logf (LOG_LOG, "no observers");
+	    yaz_log (m_log, "no observers");
 	return 0;
     }
 
@@ -172,10 +165,14 @@ int Yaz_SocketManager::processEvent()
     to.tv_sec = timeout;
     to.tv_usec = 0;
     
-    logf (LOG_LOG, "timeout=%d", timeout);
+    yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
+             no, timeout);
     while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0)
 	if (errno != EINTR)
+	{
+	    yaz_log (LOG_LOG|LOG_WARN, "select");
 	    return -1;
+	}
     now = time(0);
     for (p = m_observers; p; p = p->next)
     {
@@ -198,9 +195,12 @@ int Yaz_SocketManager::processEvent()
 	    event->event = mask;
 	    putEvent (event);
 	}
-	else if (p->timeout && now >= p->last_activity + (int) (p->timeout))
+	else if (res == 0 && p->timeout && p->timeout_this == timeout)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
+            assert (p->last_activity);
+	    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;
 	    event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
@@ -213,9 +213,14 @@ int Yaz_SocketManager::processEvent()
 	delete event;
 	return 1;
     }
-    return 0;
+    yaz_log (LOG_WARN, "unhandled event in processEvent");
+    return 1;
 }
 
+
+//    n p    n p  ......   n p    n p
+//   front                        back
+
 void Yaz_SocketManager::putEvent(YazSocketEvent *event)
 {
     // put in back of queue
@@ -279,6 +284,7 @@ Yaz_SocketManager::Yaz_SocketManager()
     m_observers = 0;
     m_queue_front = 0;
     m_queue_back = 0;
+    m_log = LOG_DEBUG;
 }
 
 Yaz_SocketManager::~Yaz_SocketManager()