Clean up after the timedelta.h/units.h merge

[libs/core.git] / source / io / poll.cpp

diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index d610665161b16f47cb20a8480beb3859eb62bbbd..a58090792fcb06cf9c4a2a9049159ac7324524a8 100644 (file)
--- a/source/io/poll.cpp
+++ b/source/io/poll.cpp
@@ -1,9 +1,13 @@
 #include <cerrno>
 #include <stdexcept>
+#ifndef WIN32
+#include <poll.h>
+#endif
 #include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
-#include <msp/time/units.h>
-#include "base.h"
+#include "eventobject.h"
+#include "handle.h"
+#include "handle_private.h"
 #include "poll.h"
 
 using namespace std;
@@ -13,7 +17,7 @@ namespace {
 using namespace Msp;
 using namespace Msp::IO;
 
-inline int sys_poll_event(PollEvent event)
+inline short int sys_poll_event(PollEvent event)
 {
        int result = 0;
 
@@ -52,13 +56,13 @@ inline PollEvent poll_event_from_sys(int event)
        return result;
 }
 
-inline PollEvent do_poll(Base &obj, PollEvent pe, int timeout)
+inline PollEvent do_poll(EventObject &obj, PollEvent pe, int timeout)
 {
 #ifdef WIN32
        if(timeout<0)
                timeout = INFINITE;
 
-       DWORD ret = WaitForSingleObject(obj.get_event_handle(), timeout);
+       DWORD ret = WaitForSingleObject(*obj.get_event_handle(), timeout);
        if(ret==WAIT_OBJECT_0)
                return pe;
        else if(ret==WAIT_FAILED)
@@ -66,7 +70,7 @@ inline PollEvent do_poll(Base &obj, PollEvent pe, int timeout)
 
        return P_NONE;
 #else
-       pollfd pfd = { obj.get_event_handle(), sys_poll_event(pe), 0 };
+       pollfd pfd = { *obj.get_event_handle(), sys_poll_event(pe), 0 };
 
        int ret = ::poll(&pfd, 1, timeout);
        if(ret==-1)
@@ -87,25 +91,41 @@ inline PollEvent do_poll(Base &obj, PollEvent pe, int timeout)
 namespace Msp {
 namespace IO {
 
+struct Poller::Private
+{
+#ifdef WIN32
+       vector<HANDLE> handles;
+#else
+       vector<pollfd> pfd;
+#endif
+};
+
+
 Poller::Poller():
-       pfd_dirty(false)
+       priv(new Private),
+       objs_changed(false)
 { }
 
-void Poller::set_object(Base &obj, PollEvent ev)
+Poller::~Poller()
+{
+       delete priv;
+}
+
+void Poller::set_object(EventObject &obj, PollEvent ev)
 {
        // Verify that the object has an event handle
        if(ev)
                obj.get_event_handle();
 
-       SlotMap::iterator i = objects.find(&obj);
+       EventMap::iterator i = objects.find(&obj);
        if(i!=objects.end())
        {
                if(ev)
-                       i->second.events = ev;
+                       i->second = ev;
                else
                        objects.erase(i);
 
-               pfd_dirty = true;
+               objs_changed = true;
        }
        else if(ev)
        {
@@ -113,9 +133,9 @@ void Poller::set_object(Base &obj, PollEvent ev)
                if(objects.size()>=MAXIMUM_WAIT_OBJECTS)
                        throw logic_error("Maximum number of wait objects reached");
 #endif
-               objects.insert(SlotMap::value_type(&obj, Slot(&obj, ev)));
+               objects.insert(EventMap::value_type(&obj, ev));
 
-               pfd_dirty = true;
+               objs_changed = true;
        }
 }
 
@@ -132,28 +152,32 @@ int Poller::poll(const Time::TimeDelta &timeout)
        return do_poll(static_cast<int>(timeout/Time::msec));
 }
 
-void Poller::rebuild_pfd()
+void Poller::rebuild_array()
 {
-       pfd.clear();
+#ifdef WIN32
+       priv->handles.clear();
 
-       pollfd p;
+       for(EventMap::iterator i=objects.begin(); i!=objects.end(); ++i)
+               priv->handles.push_back(*i->first->get_event_handle());
+#else
+       priv->pfd.clear();
 
-       for(SlotMap::iterator i=objects.begin(); i!=objects.end(); ++i)
+       for(EventMap::iterator i=objects.begin(); i!=objects.end(); ++i)
        {
-               p.fd = i->second.object->get_event_handle();
-#ifndef WIN32
-               p.events = sys_poll_event(i->second.events);
-#endif
-               pfd.push_back(p);
+               pollfd p;
+               p.fd = *i->first->get_event_handle();
+               p.events = sys_poll_event(i->second);
+               priv->pfd.push_back(p);
        }
+#endif
 
-       pfd_dirty = false;
+       objs_changed = false;
 }
 
 int Poller::do_poll(int timeout)
 {
-       if(pfd_dirty)
-               rebuild_pfd();
+       if(objs_changed)
+               rebuild_array();
 
        poll_result.clear();
 
@@ -161,12 +185,12 @@ int Poller::do_poll(int timeout)
        if(timeout<0)
                timeout = INFINITE;
 
-       DWORD ret = WaitForMultipleObjects(pfd.size(), &pfd.front().fd, false, timeout);
-       if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+pfd.size())
+       DWORD ret = WaitForMultipleObjects(priv->handles.size(), &priv->handles.front(), false, timeout);
+       if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+priv->handles.size())
        {
-               SlotMap::iterator i = objects.begin();
+               EventMap::iterator i = objects.begin();
                advance(i, ret-WAIT_OBJECT_0);
-               poll_result.push_back(Slot(i->second.object, i->second.events));
+               poll_result.push_back(Slot(i->first, i->second));
 
                return 1;
        }
@@ -175,7 +199,7 @@ int Poller::do_poll(int timeout)
 
        return 0;
 #else
-       int ret = ::poll(&pfd.front(), pfd.size(), timeout);
+       int ret = ::poll(&priv->pfd.front(), priv->pfd.size(), timeout);
        if(ret==-1)
        {
                if(errno==EINTR)
@@ -185,11 +209,11 @@ int Poller::do_poll(int timeout)
        }
 
        int n = ret;
-       SlotMap::iterator j = objects.begin();
-       for(std::vector<pollfd>::iterator i=pfd.begin(); (i!=pfd.end() && n>0); ++i,++j)
+       EventMap::iterator j = objects.begin();
+       for(vector<pollfd>::iterator i=priv->pfd.begin(); (i!=priv->pfd.end() && n>0); ++i, ++j)
                if(i->revents)
                {
-                       poll_result.push_back(Slot(j->second.object, poll_event_from_sys(i->revents)));
+                       poll_result.push_back(Slot(j->first, poll_event_from_sys(i->revents)));
                        --n;
                }
 
@@ -198,12 +222,12 @@ int Poller::do_poll(int timeout)
 }
 
 
-PollEvent poll(Base &obj, PollEvent pe)
+PollEvent poll(EventObject &obj, PollEvent pe)
 {
        return do_poll(obj, pe, -1);
 }
 
-PollEvent poll(Base &obj, PollEvent pe, const Time::TimeDelta &timeout)
+PollEvent poll(EventObject &obj, PollEvent pe, const Time::TimeDelta &timeout)
 {
        if(timeout<Time::zero)
                throw invalid_argument("poll");