X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=62182d8e23a0dd82403f04ff6020c76b739541b9;hp=cc26b97eceb33bd00e1286987c3a825ba36ded58;hb=0084c40d8bc6babaeb0b833b12d9cd625c807525;hpb=eea2caea1263bed0aae268f72d985cbb1822ac30

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index cc26b97..62182d8 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,13 +1,11 @@
-/*
- * 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.33 2005-06-08 13:28:06 adam Exp $
  */
-#ifdef WIN32
-#include <winsock.h>
-#endif
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -21,9 +19,12 @@
 #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;
 
@@ -33,8 +34,8 @@ SocketManager::SocketEntry **SocketManager::lookupObserver(
     SocketEntry **se;
     
     for (se = &m_observers; *se; se = &(*se)->next)
-	if ((*se)->observer == observer)
-	    break;
+        if ((*se)->observer == observer)
+            break;
     return se;
 }
 
@@ -45,10 +46,10 @@ void SocketManager::addObserver(int fd, ISocketObserver *observer)
     se = *lookupObserver(observer);
     if (!se)
     {
-	se = new SocketEntry;
-	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;
@@ -61,10 +62,10 @@ void SocketManager::deleteObserver(ISocketObserver *observer)
     SocketEntry **se = lookupObserver(observer);
     if (*se)
     {
-	removeEvent (observer);
-	SocketEntry *se_tmp = *se;
-	*se = (*se)->next;
-	delete se_tmp;
+        removeEvent (observer);
+        SocketEntry *se_tmp = *se;
+        *se = (*se)->next;
+        delete se_tmp;
     }
 }
 
@@ -74,9 +75,9 @@ void SocketManager::deleteObservers()
     
     while (se)
     {
-	SocketEntry *se_next = se->next;
-	delete se;
-	se = se_next;
+        SocketEntry *se_next = se->next;
+        delete se;
+        se = se_next;
     }
     m_observers = 0;
 }
@@ -86,23 +87,89 @@ void SocketManager::maskObserver(ISocketObserver *observer, int mask)
     SocketEntry *se;
 
     yaz_log(m_log, "obs=%p read=%d write=%d except=%d", observer,
-	            mask & SOCKET_OBSERVE_READ,
-	            mask & SOCKET_OBSERVE_WRITE,
-	            mask & 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 SocketManager::timeoutObserver(ISocketObserver *observer,
-					int timeout)
+                                        int timeout)
 {
     SocketEntry *se;
 
     se = *lookupObserver(observer);
     if (se)
-	se->timeout = timeout;
+        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()
@@ -113,130 +180,68 @@ int SocketManager::processEvent()
     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;
     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++;
-	if (p->mask & SOCKET_OBSERVE_READ)
-        {
-            yaz_log (m_log, "SocketManager::select fd=%d read", fd);
-	    FD_SET(fd, &in);
-        }
-	if (p->mask & SOCKET_OBSERVE_WRITE)
+        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))
         {
-            yaz_log (m_log, "SocketManager::select fd=%d write", fd);
-	    FD_SET(fd, &out);
-        }
-	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;
-	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;
+            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);
-	}
-    }
-    if (!no)
-    {
-	yaz_log (m_log, "no pending events return 0");
-	if (!m_observers)
-	    yaz_log (m_log, "no observers");
-	return 0;
+        }
+        else
+            p->timeout_this = -1;
+        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)
-	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)
+    while ((res = yaz_poll(fds, no_fds, timeout, 0)) < 0)
     {
-	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);
-
-	    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;
+        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(YLOG_WARN, "unhandled event in processEvent res=%d", res);
+
+    inspect_poll_result(res, fds, no_fds, timeout);
+
+    delete [] fds;
     return 1;
 }
 
@@ -249,13 +254,13 @@ 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;
@@ -267,16 +272,16 @@ SocketManager::SocketEvent *SocketManager::getEvent()
     // get from front of queue
     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;
 }
 
@@ -285,20 +290,20 @@ void SocketManager::removeEvent(ISocketObserver *observer)
     SocketEvent *ev = m_queue_back;
     while (ev)
     {
-	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;
+        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;
     }
 }
 
@@ -314,3 +319,12 @@ SocketManager::~SocketManager()
 {
     deleteObservers();
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+