-/*
- * Copyright (c) 1998-2005, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2008 Index Data and Mike Taylor
* See the file LICENSE for details.
- *
- * $Id: yaz-socket-manager.cpp,v 1.35 2005-06-25 15:53:19 adam Exp $
*/
-#ifdef WIN32
-#include <winsock.h>
-#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
+#include <stdlib.h>
#include <yaz/log.h>
-#include <yaz++/socket-manager.h>
+
+#include <yazpp/socket-manager.h>
+#include <yaz/poll.h>
using namespace yazpp_1;
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;
+ SocketEntry *p;
+
+ 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 (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
+ {
+ // 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();
+ }
+}
+
int SocketManager::processEvent()
{
SocketEntry *p;
return 1;
}
- fd_set in, out, except;
int res;
- int max = 0;
- int no = 0;
-
- FD_ZERO(&in);
- FD_ZERO(&out);
- FD_ZERO(&except);
-
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;
- if (p->mask)
- no++;
+ fds[i].fd = p->fd;
+ int input_mask = 0;
if (p->mask & SOCKET_OBSERVE_READ)
- {
- yaz_log (m_log, "SocketManager::select fd=%d read", fd);
- FD_SET(fd, &in);
- }
+ input_mask += yaz_poll_read;
if (p->mask & SOCKET_OBSERVE_WRITE)
- {
- yaz_log (m_log, "SocketManager::select fd=%d write", fd);
- FD_SET(fd, &out);
- }
+ input_mask += yaz_poll_write;
if (p->mask & SOCKET_OBSERVE_EXCEPT)
- {
- yaz_log (m_log, "SocketManager::select fd=%d except", fd);
- FD_SET(fd, &except);
- }
- if (fd > max)
- max = fd;
+ input_mask += yaz_poll_except;
if (p->timeout > 0 ||
(p->timeout == 0 && (p->mask & SOCKET_OBSERVE_WRITE) == 0))
{
}
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;
+ fds[i].input_mask = (enum yaz_poll_mask) input_mask;
}
- struct timeval to;
- to.tv_sec = timeout;
- to.tv_usec = 0;
-
- 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)
+ while ((res = yaz_poll(fds, no_fds, timeout, 0)) < 0)
+ {
if (errno != EINTR)
{
- yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
- yaz_log(YLOG_WARN, "errno=%d max=%d timeout=%d",
- errno, max, timeout);
+ 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(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 |= SOCKET_OBSERVE_READ;
-
- if (FD_ISSET(fd, &out))
- mask |= SOCKET_OBSERVE_WRITE;
+ }
- 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);
+ inspect_poll_result(res, fds, no_fds, timeout);
- 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);
- }
- }
- if ((event = getEvent()))
- {
- event->observer->socketNotify(event->event);
- delete event;
- return 1;
- }
- yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res);
+ delete [] fds;
return 1;
}
projects / yazpp-moved-to-github.git / blobdiff