X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpoll.h;h=40c15a70cb84389caa0d9df7a0273383dbc87ac2;hp=6367d8f2b301544f26953220284868d7658b22fb;hb=242a4a9abe1e1113b5eb39aa751aa054f696d7be;hpb=6e0fd758970bcb5bad5e3f2454b694cc4d7b4b66

diff --git a/source/io/poll.h b/source/io/poll.h
index 6367d8f..40c15a7 100644
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -1,19 +1,16 @@
 #ifndef MSP_IO_POLL_H_
 #define MSP_IO_POLL_H_
 
-#ifndef WIN32
-#include <poll.h>
-#endif
-#include <list>
 #include <map>
 #include <vector>
+#include <msp/core/attributes.h>
+#include <msp/core/noncopyable.h>
 #include <msp/time/timedelta.h>
-#include "types.h"
 
 namespace Msp {
 namespace IO {
 
-class Base;
+class EventObject;
 
 enum PollEvent
 {
@@ -21,7 +18,8 @@ enum PollEvent
 	P_INPUT = 1,
 	P_PRIO = 2,
 	P_OUTPUT = 4,
-	P_ERROR = 8
+	P_ERROR = 8,
+	P_HANGUP = 16
 };
 
 inline PollEvent operator|(PollEvent e, PollEvent f)
@@ -34,47 +32,46 @@ inline PollEvent operator~(PollEvent e)
 { return PollEvent(~static_cast<int>(e)); }
 
 
-class Poller
+class Poller: private NonCopyable
 {
 public:
-	struct Slot
+	struct PolledObject
 	{
-		Base *object;
+		EventObject *object;
 		PollEvent events;
 
-		Slot(Base *o, PollEvent e): object(o), events(e) { }
+		PolledObject(EventObject *o, PollEvent e): object(o), events(e) { }
 	};
 
-	typedef std::list<Slot> SlotSeq;
-private:
-	typedef std::map<Base *, Slot> SlotMap;
+	typedef PolledObject Slot DEPRECATED;
 
-#ifdef WIN32
-	struct pollfd
-	{
-		Handle fd;
-	};
-#endif
-
-	SlotMap objects;
-	std::vector<pollfd> pfd;
-	bool pfd_dirty;
-	SlotSeq poll_result;
+	typedef std::vector<PolledObject> SlotList DEPRECATED;
+private:
+	struct Private;
 
-	void rebuild_pfd();
-	int do_poll(int);
+	std::vector<PolledObject> objects;
+	Private *priv;
+	bool events_changed;
+	bool objs_changed;
+	std::vector<PolledObject> poll_result;
 
 public:
 	Poller();
+	~Poller();
 
-	void set_object(Base &, PollEvent);
-	int poll();
-	int poll(const Time::TimeDelta &);
-	const SlotSeq &get_result() const { return poll_result; }
+	void set_object(EventObject &, PollEvent);
+	unsigned poll();
+	unsigned poll(const Time::TimeDelta &);
+private:
+	void rebuild_array();
+	unsigned do_poll(int);
+	void platform_poll(int);
+public:
+	const std::vector<PolledObject> &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