X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=0d4fc3025ad720847ebafc31e88e71f5cdd4247f;hb=2d21fb7f6fdf924a2dcbb69722425f555b80821f;hp=5fd87431358d8ad83174e40897d92f8db1c2b45b;hpb=3eb9c4a4462d9ea7630750b541c253b145309521;p=yazpp-moved-to-github.git diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp index 5fd8743..0d4fc30 100644 --- a/src/yaz-socket-manager.cpp +++ b/src/yaz-socket-manager.cpp @@ -1,27 +1,36 @@ /* - * 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.26 2004-02-02 11:17:45 adam Exp $ + * $Id: yaz-socket-manager.cpp,v 1.34 2005-06-21 17:36:46 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 -Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( - IYazSocketObserver *observer) +using namespace yazpp_1; + +SocketManager::SocketEntry **SocketManager::lookupObserver( + ISocketObserver *observer) { - YazSocketEntry **se; + SocketEntry **se; for (se = &m_observers; *se; se = &(*se)->next) if ((*se)->observer == observer) @@ -29,14 +38,14 @@ Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( 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 = new SocketEntry; se->next= m_observers; m_observers = se; se->observer = observer; @@ -47,61 +56,61 @@ 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; + 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; + 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; } -void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer, +void SocketManager::timeoutObserver(ISocketObserver *observer, int timeout) { - YazSocketEntry *se; + SocketEntry *se; se = *lookupObserver(observer); if (se) 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); @@ -124,25 +133,25 @@ int Yaz_SocketManager::processEvent() int fd = p->fd; if (p->mask) no++; - if (p->mask & YAZ_SOCKET_OBSERVE_READ) + if (p->mask & SOCKET_OBSERVE_READ) { - yaz_log (m_log, "Yaz_SocketManager::select fd=%d read", fd); + 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); + 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); + yaz_log (m_log, "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)) + (p->timeout == 0 && (p->mask & SOCKET_OBSERVE_WRITE) == 0)) { int timeout_this; timeout_this = p->timeout; @@ -155,9 +164,11 @@ int Yaz_SocketManager::processEvent() 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) { @@ -171,14 +182,18 @@ int Yaz_SocketManager::processEvent() 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; + 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); @@ -187,17 +202,17 @@ int Yaz_SocketManager::processEvent() int fd = p->fd; int mask = 0; if (FD_ISSET(fd, &in)) - mask |= YAZ_SOCKET_OBSERVE_READ; + mask |= SOCKET_OBSERVE_READ; if (FD_ISSET(fd, &out)) - mask |= YAZ_SOCKET_OBSERVE_WRITE; + mask |= SOCKET_OBSERVE_WRITE; if (FD_ISSET(fd, &except)) - mask |= YAZ_SOCKET_OBSERVE_EXCEPT; + mask |= SOCKET_OBSERVE_EXCEPT; if (mask) { - YazSocketEvent *event = new YazSocketEvent; + SocketEvent *event = new SocketEvent; p->last_activity = now; event->observer = p->observer; event->event = mask; @@ -205,19 +220,15 @@ int Yaz_SocketManager::processEvent() yaz_log (m_log, "putEvent I/O mask=%d", mask); } - else if ( - (p->timeout > 0 || - (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0)) - && - (now - p->last_activity) >= p->timeout) + else if (res == 0 && p->timeout_this == timeout) { - YazSocketEvent *event = new YazSocketEvent; + 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); + 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; + event->event = SOCKET_OBSERVE_TIMEOUT; putEvent (event); } } @@ -227,7 +238,7 @@ int Yaz_SocketManager::processEvent() 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; } @@ -235,7 +246,7 @@ 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) @@ -253,10 +264,10 @@ void Yaz_SocketManager::putEvent(YazSocketEvent *event) 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; assert (m_queue_back); @@ -271,12 +282,12 @@ Yaz_SocketManager::YazSocketEvent *Yaz_SocketManager::getEvent() 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; + SocketEvent *ev_next = ev->next; if (observer == ev->observer) { if (ev->prev) @@ -293,15 +304,15 @@ void Yaz_SocketManager::removeEvent(IYazSocketObserver *observer) } } -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(); }