Fix a memory leak in Poller

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

diff --git a/source/io/poll.h b/source/io/poll.h
index 595237474c706acd35d9fdc48aa186d65225b7de..d7823aa9108d8d16bd856fd2fbb4b35f41ac04fa 100644 (file)
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -1,19 +1,15 @@
 #ifndef MSP_IO_POLL_H_
 #define MSP_IO_POLL_H_
 
-#ifndef WIN32
-#include <poll.h>
-#endif
 #include <list>
 #include <map>
 #include <vector>
 #include <msp/time/timedelta.h>
-#include "types.h"
 
 namespace Msp {
 namespace IO {
 
-class Base;
+class EventObject;
 
 enum PollEvent
 {
@@ -39,43 +35,39 @@ class Poller
 public:
        struct Slot
        {
-               Base *object;
+               EventObject *object;
                PollEvent events;
 
-               Slot(Base *o, PollEvent e): object(o), events(e) { }
+               Slot(EventObject *o, PollEvent e): object(o), events(e) { }
        };
 
-       typedef std::list<Slot> SlotSeq;
+       typedef std::list<Slot> SlotList;
 private:
-       typedef std::map<Base *, Slot> SlotMap;
+       typedef std::map<EventObject *, PollEvent> EventMap;
 
-#ifdef WIN32
-       struct pollfd
-       {
-               Handle fd;
-       };
-#endif
+       struct Private;
 
-       SlotMap objects;
-       std::vector<pollfd> pfd;
-       bool pfd_dirty;
-       SlotSeq poll_result;
+       EventMap objects;
+       Private *priv;
+       bool objs_changed;
+       SlotList poll_result;
 
 public:
        Poller();
+       ~Poller();
 
-       void set_object(Base &, PollEvent);
+       void set_object(EventObject &, PollEvent);
        int poll();
        int poll(const Time::TimeDelta &);
 private:
-       void rebuild_pfd();
+       void rebuild_array();
        int do_poll(int);
 public:
-       const SlotSeq &get_result() const { return poll_result; }
+       const SlotList &get_result() const { return poll_result; }
 };
 
-PollEvent poll(Base &, PollEvent);
-PollEvent poll(Base &, PollEvent, const Time::TimeDelta &);
+PollEvent poll(EventObject &, PollEvent);
+PollEvent poll(EventObject &, PollEvent, const Time::TimeDelta &);
 
 } // namespace IO
 } // namespace Msp