4 files changed, 8 insertions, 12 deletions
diff --git a/include/socketengine.h b/include/socketengine.h
index fd01b4cf8..1b68f1685 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -216,20 +216,16 @@ public:
 	 */
 	EventHandler* GetRef(int fd);
 
-	/** Waits for an event.
+	/** Waits for events and dispatches them to handlers.
 	 * Please note that this doesnt wait long, only
-	 * a couple of milliseconds. It returns a list
-	 * of active EventHandlers in the array fdlist
-	 * which the core will then dispatch events to
+	 * a couple of milliseconds. It returns the number of
+	 * events which occured during this call.
+	 * This method will dispatch events to their handlers
 	 * by calling their EventHandler::HandleEvent()
 	 * methods with the neccessary EventType value.
-	 * @param fdlist A pointer to a set of EventHandler
-	 * classes. You should ensure that the array you pass
-	 * is at least MAX_DESCRIPTORS in size, to accomodate
-	 * for the maximum number of events which can occur.
 	 * @return The number of events which have occured.
 	 */
-	virtual int Wait(EventHandler** fdlist);
+	virtual int DispatchEvents();
 
 	/** Returns the socket engines name.
 	 * This returns the name of the engine for use
diff --git a/include/socketengine_epoll.h b/include/socketengine_epoll.h
index 04ede734d..8e4d6308f 100644
--- a/include/socketengine_epoll.h
+++ b/include/socketengine_epoll.h
@@ -49,7 +49,7 @@ public:
 	virtual int GetMaxFds();
 	virtual int GetRemainingFds();
 	virtual bool DelFd(EventHandler* eh);
-	virtual int Wait(EventHandler** fdlist);
+	virtual int DispatchEvents();
 	virtual std::string GetName();
 };
 
diff --git a/include/socketengine_kqueue.h b/include/socketengine_kqueue.h
index 392843697..1d7becba0 100644
--- a/include/socketengine_kqueue.h
+++ b/include/socketengine_kqueue.h
@@ -53,7 +53,7 @@ public:
 	virtual int GetMaxFds();
 	virtual int GetRemainingFds();
 	virtual bool DelFd(EventHandler* eh);
-	virtual int Wait(EventHandler** fdlist);
+	virtual int DispatchEvents();
 	virtual std::string GetName();
 };
 
diff --git a/include/socketengine_select.h b/include/socketengine_select.h
index d4b366b21..37a6fc1b6 100644
--- a/include/socketengine_select.h
+++ b/include/socketengine_select.h
@@ -51,7 +51,7 @@ public:
 	virtual int GetMaxFds();
 	virtual int GetRemainingFds();
 	virtual bool DelFd(EventHandler* eh);
-	virtual int Wait(EventHandler** fdlist);
+	virtual int DispatchEvents();
 	virtual std::string GetName();
 };