X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=3398090a57849cbcfadd3e54b6e665183fb405eb;hp=dd61fb1ad1c90686e7cf548102a6ad080eac7252;hb=d84b43231c7c5b0786e9aa62d0f7ca7ecd83bdb5;hpb=87be6c609c22d9620c781b95ab74298b63694055 diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp index dd61fb1..3398090 100644 --- a/src/yaz-socket-manager.cpp +++ b/src/yaz-socket-manager.cpp @@ -1,39 +1,8 @@ /* - * Copyright (c) 1998-1999, Index Data. + * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * - * $Log: yaz-socket-manager.cpp,v $ - * 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.24 2004-01-07 13:40:06 adam Exp $ */ #include #ifdef WIN32 @@ -47,8 +16,7 @@ #include #include -#include - +#include Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( IYazSocketObserver *observer) @@ -76,7 +44,7 @@ void Yaz_SocketManager::addObserver(int fd, IYazSocketObserver *observer) se->fd = fd; se->mask = 0; se->last_activity = 0; - se->timeout = 0; + se->timeout = -1; } void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer) @@ -108,13 +76,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; @@ -127,8 +100,8 @@ int Yaz_SocketManager::processEvent() { 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); @@ -152,30 +125,44 @@ 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) + if (p->timeout >= 0) { - unsigned timeout_this; + int timeout_this; timeout_this = p->timeout; if (p->last_activity) timeout_this -= now - p->last_activity; - if (timeout_this < 1) - timeout_this = 1; - if (!timeout || timeout_this < timeout) + 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) { - 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; } @@ -183,10 +170,15 @@ int Yaz_SocketManager::processEvent() 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); + while ((res = select(max + 1, &in, &out, &except, + timeout== -1 ? 0 : &to)) < 0) if (errno != EINTR) + { + yaz_log (LOG_LOG|LOG_WARN, "select"); return -1; + } now = time(0); for (p = m_observers; p; p = p->next) { @@ -208,13 +200,15 @@ 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 (p->timeout && p->last_activity && - now >= p->last_activity + (int) (p->timeout)) + else if (p->timeout && (now - p->last_activity) >= p->timeout) { YazSocketEvent *event = new YazSocketEvent; - logf (LOG_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, 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; @@ -227,9 +221,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