X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=1a2d472d468618a780c7e05228abbe15e380898f;hp=3398090a57849cbcfadd3e54b6e665183fb405eb;hb=f4a712d1c3fe702351dadafdeab971a16d9960c4;hpb=eca406342a6af973b7b8687e739b3ebc2d8a18c5 diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp index 3398090..1a2d472 100644 --- a/src/yaz-socket-manager.cpp +++ b/src/yaz-socket-manager.cpp @@ -1,45 +1,54 @@ /* - * Copyright (c) 1998-2004, Index Data. + * Copyright (c) 1998-2005, Index Data. * See the file LICENSE for details. * - * $Id: yaz-socket-manager.cpp,v 1.24 2004-01-07 13:40:06 adam Exp $ + * $Id: yaz-socket-manager.cpp,v 1.36 2006-03-29 13:14:17 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 + +using namespace yazpp_1; -Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( - IYazSocketObserver *observer) +SocketManager::SocketEntry **SocketManager::lookupObserver( + ISocketObserver *observer) { - YazSocketEntry **se; + SocketEntry **se; for (se = &m_observers; *se; se = &(*se)->next) - if ((*se)->observer == observer) - break; + if ((*se)->observer == observer) + break; return se; } -void Yaz_SocketManager::addObserver(int fd, IYazSocketObserver *observer) +void SocketManager::addObserver(int fd, ISocketObserver *observer) { - YazSocketEntry *se; + SocketEntry *se; se = *lookupObserver(observer); if (!se) { - se = new YazSocketEntry; - se->next= m_observers; - m_observers = se; - se->observer = observer; + se = new SocketEntry; + se->next= m_observers; + m_observers = se; + se->observer = observer; } se->fd = fd; se->mask = 0; @@ -47,66 +56,66 @@ void Yaz_SocketManager::addObserver(int fd, IYazSocketObserver *observer) se->timeout = -1; } -void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer) +void SocketManager::deleteObserver(ISocketObserver *observer) { - YazSocketEntry **se = lookupObserver(observer); + SocketEntry **se = lookupObserver(observer); if (*se) { - removeEvent (observer); - YazSocketEntry *se_tmp = *se; - *se = (*se)->next; - delete se_tmp; + removeEvent (observer); + SocketEntry *se_tmp = *se; + *se = (*se)->next; + delete se_tmp; } } -void Yaz_SocketManager::deleteObservers() +void SocketManager::deleteObservers() { - YazSocketEntry *se = m_observers; + SocketEntry *se = m_observers; while (se) { - YazSocketEntry *se_next = se->next; - delete se; - se = se_next; + SocketEntry *se_next = se->next; + delete se; + se = se_next; } m_observers = 0; } -void Yaz_SocketManager::maskObserver(IYazSocketObserver *observer, int mask) +void SocketManager::maskObserver(ISocketObserver *observer, int mask) { - YazSocketEntry *se; + SocketEntry *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); + mask & SOCKET_OBSERVE_READ, + mask & SOCKET_OBSERVE_WRITE, + mask & SOCKET_OBSERVE_EXCEPT); se = *lookupObserver(observer); if (se) - se->mask = mask; + se->mask = mask; } -void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer, - int timeout) +void SocketManager::timeoutObserver(ISocketObserver *observer, + int timeout) { - YazSocketEntry *se; + SocketEntry *se; se = *lookupObserver(observer); if (se) - se->timeout = timeout; + se->timeout = timeout; } -int Yaz_SocketManager::processEvent() +int SocketManager::processEvent() { - YazSocketEntry *p; - YazSocketEvent *event = getEvent(); + SocketEntry *p; + SocketEvent *event = getEvent(); int timeout = -1; - yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this); + yaz_log (m_log, "SocketManager::processEvent manager=%p", this); if (event) { - event->observer->socketNotify(event->event); - delete event; - return 1; + event->observer->socketNotify(event->event); + delete event; + return 1; } fd_set in, out, except; @@ -121,107 +130,115 @@ int Yaz_SocketManager::processEvent() time_t now = time(0); for (p = m_observers; p; p = p->next) { - int fd = p->fd; - if (p->mask) - no++; - if (p->mask & YAZ_SOCKET_OBSERVE_READ) + int fd = p->fd; + if (p->mask) + no++; + if (p->mask & SOCKET_OBSERVE_READ) { - yaz_log (m_log, "Yaz_SocketManager::select fd=%d read", fd); - FD_SET(fd, &in); + yaz_log (m_log, "SocketManager::select fd=%d read", fd); + FD_SET(fd, &in); } - if (p->mask & YAZ_SOCKET_OBSERVE_WRITE) + if (p->mask & SOCKET_OBSERVE_WRITE) { - yaz_log (m_log, "Yaz_SocketManager::select fd=%d write", fd); - FD_SET(fd, &out); + yaz_log (m_log, "SocketManager::select fd=%d write", fd); + FD_SET(fd, &out); } - if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT) + if (p->mask & SOCKET_OBSERVE_EXCEPT) { - yaz_log (m_log, "Yaz_SocketManager::select fd=%d except", fd); - FD_SET(fd, &except); + yaz_log (m_log, "SocketManager::select fd=%d except", fd); + FD_SET(fd, &except); } - if (fd > max) - max = fd; - if (p->timeout >= 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; + if (fd > max) + max = fd; + if (p->timeout > 0 || + (p->timeout == 0 && (p->mask & 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", + yaz_log (m_log, "SocketManager::select timeout_this=%d", p->timeout_this); - } + } + else + p->timeout_this = -1; } if (!no) { - yaz_log (m_log, "no pending events return 0"); - if (!m_observers) - yaz_log (m_log, "no observers"); - return 0; + yaz_log (m_log, "no pending events return 0"); + if (!m_observers) + yaz_log (m_log, "no observers"); + return 0; } struct timeval to; to.tv_sec = timeout; to.tv_usec = 0; - yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d", + yaz_log (m_log, "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 (LOG_LOG|LOG_WARN, "select"); - return -1; - } + 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; - int mask = 0; - if (FD_ISSET(fd, &in)) - mask |= YAZ_SOCKET_OBSERVE_READ; + int fd = p->fd; + int mask = 0; + if (FD_ISSET(fd, &in)) + mask |= SOCKET_OBSERVE_READ; - if (FD_ISSET(fd, &out)) - mask |= YAZ_SOCKET_OBSERVE_WRITE; + if (FD_ISSET(fd, &out)) + mask |= SOCKET_OBSERVE_WRITE; - if (FD_ISSET(fd, &except)) - mask |= YAZ_SOCKET_OBSERVE_EXCEPT; - - if (mask) - { - YazSocketEvent *event = new YazSocketEvent; - p->last_activity = now; - event->observer = p->observer; - event->event = mask; - putEvent (event); + if (FD_ISSET(fd, &except)) + mask |= SOCKET_OBSERVE_EXCEPT; + + if (mask) + { + SocketEvent *event = new SocketEvent; + 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 (p->timeout && (now - p->last_activity) >= p->timeout) - { - YazSocketEvent *event = new YazSocketEvent; + yaz_log (m_log, "putEvent I/O mask=%d", mask); + } + else if (res == 0 && p->timeout_this == timeout) + { + SocketEvent *event = new SocketEvent; 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; - putEvent (event); - } + 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 = SOCKET_OBSERVE_TIMEOUT; + putEvent (event); + } } if ((event = getEvent())) { - event->observer->socketNotify(event->event); - delete event; - return 1; + event->observer->socketNotify(event->event); + delete event; + return 1; } - yaz_log (LOG_WARN, "unhandled event in processEvent"); + yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res); return 1; } @@ -229,73 +246,81 @@ int Yaz_SocketManager::processEvent() // n p n p ...... n p n p // front back -void Yaz_SocketManager::putEvent(YazSocketEvent *event) +void SocketManager::putEvent(SocketEvent *event) { // put in back of queue if (m_queue_back) { - m_queue_back->prev = event; - assert (m_queue_front); + m_queue_back->prev = event; + assert (m_queue_front); } else { - assert (!m_queue_front); - m_queue_front = event; + assert (!m_queue_front); + m_queue_front = event; } event->next = m_queue_back; event->prev = 0; m_queue_back = event; } -Yaz_SocketManager::YazSocketEvent *Yaz_SocketManager::getEvent() +SocketManager::SocketEvent *SocketManager::getEvent() { // get from front of queue - YazSocketEvent *event = m_queue_front; + SocketEvent *event = m_queue_front; if (!event) - return 0; + return 0; assert (m_queue_back); m_queue_front = event->prev; if (m_queue_front) { - assert (m_queue_back); - m_queue_front->next = 0; + assert (m_queue_back); + m_queue_front->next = 0; } else - m_queue_back = 0; + m_queue_back = 0; return event; } -void Yaz_SocketManager::removeEvent(IYazSocketObserver *observer) +void SocketManager::removeEvent(ISocketObserver *observer) { - YazSocketEvent *ev = m_queue_back; + SocketEvent *ev = m_queue_back; while (ev) { - YazSocketEvent *ev_next = ev->next; - if (observer == ev->observer) - { - if (ev->prev) - ev->prev->next = ev->next; - else - m_queue_back = ev->next; - if (ev->next) - ev->next->prev = ev->prev; - else - m_queue_front = ev->prev; - delete ev; - } - ev = ev_next; + SocketEvent *ev_next = ev->next; + if (observer == ev->observer) + { + if (ev->prev) + ev->prev->next = ev->next; + else + m_queue_back = ev->next; + if (ev->next) + ev->next->prev = ev->prev; + else + m_queue_front = ev->prev; + delete ev; + } + ev = ev_next; } } -Yaz_SocketManager::Yaz_SocketManager() +SocketManager::SocketManager() { m_observers = 0; m_queue_front = 0; m_queue_back = 0; - m_log = LOG_DEBUG; + m_log = YLOG_DEBUG; } -Yaz_SocketManager::~Yaz_SocketManager() +SocketManager::~SocketManager() { deleteObservers(); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +