-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2012 Index Data and Mike Taylor
* See the file LICENSE for details.
- *
- * $Id: yaz-socket-manager.cpp,v 1.24 2004-01-07 13:40:06 adam Exp $
*/
-#include <assert.h>
-#ifdef WIN32
-#include <winsock.h>
-#else
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+
#include <errno.h>
#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
#include <yaz/log.h>
-#include <yaz++/socket-manager.h>
-Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
- IYazSocketObserver *observer)
+#include <yazpp/socket-manager.h>
+#include <yaz/poll.h>
+
+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)
- 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;
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()
+
+void SocketManager::inspect_poll_result(int res, struct yaz_poll_fd *fds,
+ int no_fds, int timeout)
+
{
- YazSocketEntry *p;
- YazSocketEvent *event = getEvent();
- int timeout = -1;
- yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
- if (event)
+ yaz_log(m_log, "yaz_poll returned res=%d", res);
+ time_t now = time(0);
+ int i;
+ int no_put_events = 0;
+ SocketEntry *p;
+
+ for (i = 0, p = m_observers; p; p = p->next, i++)
{
- event->observer->socketNotify(event->event);
- delete event;
- return 1;
- }
+ enum yaz_poll_mask output_mask = fds[i].output_mask;
- fd_set in, out, except;
- int res;
- int max = 0;
- int no = 0;
+ int mask = 0;
+ if (output_mask & yaz_poll_read)
+ mask |= SOCKET_OBSERVE_READ;
- FD_ZERO(&in);
- FD_ZERO(&out);
- FD_ZERO(&except);
+ if (output_mask & yaz_poll_write)
+ mask |= SOCKET_OBSERVE_WRITE;
- 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)
+ if (output_mask & yaz_poll_except)
+ mask |= SOCKET_OBSERVE_EXCEPT;
+
+ if (mask)
{
- yaz_log (m_log, "Yaz_SocketManager::select fd=%d read", fd);
- FD_SET(fd, &in);
+ SocketEvent *event = new SocketEvent;
+ p->last_activity = now;
+ event->observer = p->observer;
+ event->event = mask;
+ putEvent (event);
+ no_put_events++;
+ yaz_log (m_log, "putEvent I/O mask=%d", mask);
}
- if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
+ else if (res == 0 && p->timeout_this == timeout)
{
- 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);
+ SocketEvent *event = new SocketEvent;
+ 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 = SOCKET_OBSERVE_TIMEOUT;
+ putEvent (event);
+ no_put_events++;
+
}
- 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;
- p->timeout_this = timeout_this;
- yaz_log (m_log, "Yaz_SocketManager::select timeout_this=%d",
- p->timeout_this);
- }
}
- if (!no)
+ SocketEvent *event = getEvent();
+ if (event)
+ {
+ event->observer->socketNotify(event->event);
+ delete event;
+ }
+ else
{
- yaz_log (m_log, "no pending events return 0");
- if (!m_observers)
- yaz_log (m_log, "no observers");
- return 0;
+ // bug #2035
+
+ yaz_log(YLOG_WARN, "unhandled socket event. yaz_poll returned %d", res);
+ yaz_log(YLOG_WARN, "no_put_events=%d no_fds=%d i=%d timeout=%d",
+ no_put_events, no_fds, i, timeout);
+ abort();
}
+}
- 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);
- 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);
+int SocketManager::processEvent()
+{
+ SocketEntry *p;
+ SocketEvent *event = getEvent();
+ int timeout = -1;
+ yaz_log (m_log, "SocketManager::processEvent manager=%p", this);
+ if (event)
+ {
+ event->observer->socketNotify(event->event);
+ delete event;
+ return 1;
+ }
+
+ int res;
+ time_t now = time(0);
+ int i;
+ int no_fds = 0;
for (p = m_observers; p; p = p->next)
+ no_fds++;
+
+ if (!no_fds)
+ return 0;
+ struct yaz_poll_fd *fds = new yaz_poll_fd [no_fds];
+ for (i = 0, p = m_observers; p; p = p->next, i++)
{
- int fd = p->fd;
- int mask = 0;
- if (FD_ISSET(fd, &in))
- mask |= YAZ_SOCKET_OBSERVE_READ;
-
- if (FD_ISSET(fd, &out))
- mask |= YAZ_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);
-
- yaz_log (m_log, "putEvent I/O mask=%d", mask);
- }
- else if (p->timeout && (now - p->last_activity) >= p->timeout)
- {
- YazSocketEvent *event = new YazSocketEvent;
- 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);
- }
+ fds[i].fd = p->fd;
+ int input_mask = 0;
+ if (p->mask & SOCKET_OBSERVE_READ)
+ input_mask += yaz_poll_read;
+ if (p->mask & SOCKET_OBSERVE_WRITE)
+ input_mask += yaz_poll_write;
+ if (p->mask & SOCKET_OBSERVE_EXCEPT)
+ input_mask += yaz_poll_except;
+ 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, "SocketManager::select timeout_this=%d",
+ p->timeout_this);
+ }
+ else
+ p->timeout_this = -1;
+ fds[i].input_mask = (enum yaz_poll_mask) input_mask;
}
- if ((event = getEvent()))
+
+ int pass = 0;
+ while ((res = yaz_poll(fds, no_fds, timeout, 0)) < 0)
{
- event->observer->socketNotify(event->event);
- delete event;
- return 1;
+ if (errno != EINTR)
+ {
+ yaz_log(YLOG_ERRNO|YLOG_WARN, "yaz_poll");
+ yaz_log(YLOG_WARN, "errno=%d timeout=%d", errno, timeout);
+ if (++pass > 10)
+ return -1;
+ }
}
- yaz_log (LOG_WARN, "unhandled event in processEvent");
+
+ inspect_poll_result(res, fds, no_fds, timeout);
+
+ delete [] fds;
return 1;
}
// 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
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yazpp-moved-to-github.git / blobdiff