/*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Log: yaz-socket-manager.cpp,v $
- * 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
- * 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
- * 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.29 2004-11-30 21:10:31 adam Exp $
*/
#include <assert.h>
#ifdef WIN32
#include <errno.h>
#include <string.h>
-#include <yaz/log.h>
-#include <yaz++/yaz-socket-manager.h>
+#include <yaz/ylog.h>
+#include <yaz++/socket-manager.h>
Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
IYazSocketObserver *observer)
se->fd = fd;
se->mask = 0;
se->last_activity = 0;
- se->timeout = 0;
+ se->timeout = -1;
}
void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer)
{
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;
}
void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer,
- unsigned timeout)
+ int timeout)
{
YazSocketEntry *se;
{
YazSocketEntry *p;
YazSocketEvent *event = getEvent();
- unsigned timeout = 0;
- logf (m_log, "processEvent");
+ int timeout = -1;
+ yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
if (event)
{
event->observer->socketNotify(event->event);
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)
+ if (p->timeout > 0 ||
+ (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
{
- unsigned timeout_this;
+ int timeout_this;
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)
+ if (timeout_this < 0 || timeout_this > 2147483646)
+ timeout_this = 0;
+ if (timeout == -1 || 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 (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;
}
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)
+ yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
+ no, timeout);
+ int pass = 0;
+ while ((res = select(max + 1, &in, &out, &except,
+ timeout== -1 ? 0 : &to)) < 0)
if (errno != EINTR)
- return -1;
+ {
+ yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
+ yaz_log(YLOG_WARN, "errno=%d max=%d timeout=%d",
+ errno, max, timeout);
+ if (++pass > 10)
+ return -1;
+ }
+ yaz_log(m_log, "select returned res=%d", res);
now = time(0);
for (p = m_observers; p; p = p->next)
{
event->observer = p->observer;
event->event = mask;
putEvent (event);
+
+ yaz_log (m_log, "putEvent I/O mask=%d", mask);
}
- else if (p->timeout && p->last_activity &&
- now >= p->last_activity + (int) (p->timeout))
+ else if (res == 0 && p->timeout_this == timeout)
{
YazSocketEvent *event = new YazSocketEvent;
- logf (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
- now, p->last_activity, p->timeout);
+ assert (p->last_activity);
+ yaz_log (m_log, "putEvent timeout fd=%d, now = %ld last_activity=%ld timeout=%d",
+ p->fd, now, p->last_activity, p->timeout);
p->last_activity = now;
event->observer = p->observer;
event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
delete event;
return 1;
}
- return 0;
+ yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res);
+ return 1;
}
m_observers = 0;
m_queue_front = 0;
m_queue_back = 0;
- m_log = LOG_DEBUG;
+ m_log = YLOG_DEBUG;
}
Yaz_SocketManager::~Yaz_SocketManager()
projects / yazpp-moved-to-github.git / blobdiff