X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpoll.h;h=fdb68c515bbe35e0e05cafdde93e59c625a7bced;hp=78e6088f8bfe0f5289864550136cedab5154df84;hb=292aed8e23ea543b089d5f2a73000de4640befe7;hpb=c21ab7e49852585df01b4cc19599e25a918b581b

diff --git a/source/io/poll.h b/source/io/poll.h
index 78e6088..fdb68c5 100644
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -1,9 +1,10 @@
 #ifndef MSP_IO_POLL_H_
 #define MSP_IO_POLL_H_
 
-#include <list>
 #include <map>
 #include <vector>
+#include <msp/core/attributes.h>
+#include <msp/core/noncopyable.h>
 #include <msp/time/timedelta.h>
 
 namespace Msp {
@@ -17,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)
@@ -30,7 +32,7 @@ inline PollEvent operator~(PollEvent e)
 { return PollEvent(~static_cast<int>(e)); }
 
 
-class Poller
+class Poller: private NonCopyable
 {
 public:
 	struct Slot
@@ -41,19 +43,19 @@ public:
 		Slot(EventObject *o, PollEvent e): object(o), events(e) { }
 	};
 
-	typedef std::list<Slot> SlotList;
+	typedef std::vector<Slot> SlotList DEPRECATED;
 private:
-	typedef std::map<EventObject *, PollEvent> EventMap;
-
 	struct Private;
 
-	EventMap objects;
+	std::vector<Slot> objects;
 	Private *priv;
+	bool events_changed;
 	bool objs_changed;
-	SlotList poll_result;
+	std::vector<Slot> poll_result;
 
 public:
 	Poller();
+	~Poller();
 
 	void set_object(EventObject &, PollEvent);
 	int poll();
@@ -61,8 +63,9 @@ public:
 private:
 	void rebuild_array();
 	int do_poll(int);
+	void platform_poll(int);
 public:
-	const SlotList &get_result() const { return poll_result; }
+	const std::vector<Slot> &get_result() const { return poll_result; }
 };
 
 PollEvent poll(EventObject &, PollEvent);