-/*
- * Copyright (c) 1998-2005, 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.37 2007-11-09 21:49:15 adam Exp $
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <errno.h>
#include <string.h>
#include <assert.h>
+#include <stdlib.h>
#include <yaz/log.h>
ISocketObserver *observer)
{
SocketEntry **se;
-
+
for (se = &m_observers; *se; se = &(*se)->next)
if ((*se)->observer == observer)
break;
return se;
}
+int SocketManager::getNumberOfObservers()
+{
+ int i = 0;
+ SocketEntry *se;
+ for (se = m_observers; se; se = se->next, i++)
+ ;
+ return i;
+}
+
void SocketManager::addObserver(int fd, ISocketObserver *observer)
{
SocketEntry *se;
void SocketManager::deleteObservers()
{
SocketEntry *se = m_observers;
-
+
while (se)
{
SocketEntry *se_next = se->next;
se->timeout = timeout;
}
+
+void SocketManager::inspect_poll_result(int res, struct yaz_poll_fd *fds,
+ int no_fds, int timeout)
+
+{
+ yaz_log(m_log, "yaz_poll returned res=%d", res);
+ time_t now = time(0);
+ int i;
+ int no_put_events = 0;
+ int no_lost_observers = 0;
+
+ for (i = 0; i < no_fds; i++)
+ {
+ SocketEntry *p;
+ for (p = m_observers; p; p = p->next)
+ if (p->fd == fds[i].fd)
+ break;
+ if (!p)
+ {
+ // m_observers list changed since poll started
+ no_lost_observers++;
+ continue;
+ }
+
+ enum yaz_poll_mask output_mask = fds[i].output_mask;
+
+ int mask = 0;
+ if (output_mask & yaz_poll_read)
+ mask |= SOCKET_OBSERVE_READ;
+
+ if (output_mask & yaz_poll_write)
+ mask |= SOCKET_OBSERVE_WRITE;
+
+ if (output_mask & yaz_poll_except)
+ mask |= SOCKET_OBSERVE_EXCEPT;
+
+ if (mask)
+ {
+ 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);
+ }
+ else if (res == 0 && p->timeout_this == timeout)
+ {
+ 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++;
+
+ }
+ }
+ SocketEvent *event = getEvent();
+ if (event)
+ {
+ event->observer->socketNotify(event->event);
+ delete event;
+ }
+ else
+ {
+ if (no_lost_observers == 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);
+ }
+ }
+}
+
int SocketManager::processEvent()
{
SocketEntry *p;
if (timeout == -1 || timeout_this < timeout)
timeout = timeout_this;
p->timeout_this = timeout_this;
- yaz_log (m_log, "SocketManager::select timeout_this=%d",
+ yaz_log (m_log, "SocketManager::select timeout_this=%d",
p->timeout_this);
}
else
}
int pass = 0;
- while ((res = yaz_poll(fds, no_fds, timeout)) < 0)
+ while ((res = yaz_poll(fds, no_fds, timeout, 0)) < 0 && pass < 10)
{
- if (errno != EINTR)
+ 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;
+ delete [] fds;
+ return 1;
}
+ yaz_log(YLOG_ERRNO|YLOG_WARN, "yaz_poll");
+ yaz_log(YLOG_WARN, "errno=%d timeout=%d", errno, timeout);
}
-
- yaz_log(m_log, "select returned res=%d", res);
- now = time(0);
- for (i = 0, p = m_observers; p; p = p->next, i++)
- {
- enum yaz_poll_mask output_mask = fds[i].output_mask;
- int mask = 0;
- if (output_mask & yaz_poll_read)
- mask |= SOCKET_OBSERVE_READ;
+ if (res >= 0)
+ inspect_poll_result(res, fds, no_fds, timeout);
- if (output_mask & yaz_poll_write)
- mask |= SOCKET_OBSERVE_WRITE;
-
- if (output_mask & yaz_poll_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 (res == 0 && p->timeout_this == timeout)
- {
- 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);
- }
- }
delete [] fds;
- if ((event = getEvent()))
- {
- event->observer->socketNotify(event->event);
- delete event;
- return 1;
- }
- yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res);
- return 1;
+ return res >= 0 ? 1 : -1;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab