X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=4a75923765aaae1169ff3c222829db53ad68b8fb;hb=5e3f7e1a720a08d30c407049c94c6ca825a5ed27;hp=95bcc809ce20b8268570b291becda2629dd43be5;hpb=cc44793fb69db2885c570cc5de05fda796993bba;p=yazpp-moved-to-github.git diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp index 95bcc80..4a75923 100644 --- a/src/yaz-socket-manager.cpp +++ b/src/yaz-socket-manager.cpp @@ -1,33 +1,29 @@ /* - * Copyright (c) 1998-1999, Index Data. + * Copyright (c) 1998-2005, Index Data. * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * - * $Log: yaz-socket-manager.cpp,v $ - * 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.31 2005-01-14 10:13:50 adam Exp $ */ -#include #ifdef WIN32 #include -#else +#endif + +#if HAVE_SYS_TIME_H #include +#endif +#if HAVE_SYS_TYPES_H #include +#endif +#if HAVE_UNISTD_H #include #endif -#include -#include -#include +#include +#include +#include +#include +#include Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( IYazSocketObserver *observer) @@ -54,6 +50,8 @@ void Yaz_SocketManager::addObserver(int fd, IYazSocketObserver *observer) } se->fd = fd; se->mask = 0; + se->last_activity = 0; + se->timeout = -1; } void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer) @@ -85,13 +83,18 @@ 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; } void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer, - unsigned timeout) + int timeout) { YazSocketEntry *se; @@ -104,6 +107,8 @@ int Yaz_SocketManager::processEvent() { YazSocketEntry *p; YazSocketEvent *event = getEvent(); + int timeout = -1; + yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this); if (event) { event->observer->socketNotify(event->event); @@ -115,38 +120,79 @@ int Yaz_SocketManager::processEvent() int res; int max = 0; int no = 0; - struct timeval to; - struct timeval *timeout = &to; FD_ZERO(&in); FD_ZERO(&out); FD_ZERO(&except); - timeout = &to; /* hang on select */ - to.tv_sec = 60; - to.tv_usec = 0; - + time_t now = time(0); for (p = m_observers; p; p = p->next) { int fd = p->fd; - logf (LOG_LOG, "fd = %d mask=%d", fd, p->mask); 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 > 0 || + (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0)) + { + 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 < 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) + { + yaz_log (m_log, "no pending events return 0"); + if (!m_observers) + yaz_log (m_log, "no observers"); return 0; - while ((res = select(max + 1, &in, &out, &except, timeout)) < 0) - if (errno != EINTR) - return -1; + } + struct timeval to; + to.tv_sec = timeout; + to.tv_usec = 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) + { + 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) { int fd = p->fd; @@ -163,9 +209,23 @@ int Yaz_SocketManager::processEvent() if (mask) { YazSocketEvent *event = new YazSocketEvent; + p->last_activity = now; 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_this == timeout) + { + YazSocketEvent *event = new YazSocketEvent; + 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; + putEvent (event); } } if ((event = getEvent())) @@ -174,9 +234,14 @@ int Yaz_SocketManager::processEvent() delete event; return 1; } - return 0; + yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res); + return 1; } + +// n p n p ...... n p n p +// front back + void Yaz_SocketManager::putEvent(YazSocketEvent *event) { // put in back of queue @@ -240,6 +305,7 @@ Yaz_SocketManager::Yaz_SocketManager() m_observers = 0; m_queue_front = 0; m_queue_back = 0; + m_log = YLOG_DEBUG; } Yaz_SocketManager::~Yaz_SocketManager()