Fix double printing of 'setting log file' and 'setting config file' paths.

[user/henk/code/inspircd.git] / include / socketengine_select.h

diff --git a/include/socketengine_select.h b/include/socketengine_select.h
index bbd9b78dda56acc313d9af4dcd85e488088ba033..2126e8ec56053e8c33a21be7a2d7e56de5e7a6c6 100644 (file)
--- a/include/socketengine_select.h
+++ b/include/socketengine_select.h
@@ -2,17 +2,14 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
-*/
+ */
 
 #ifndef __SOCKETENGINE_SELECT__
 #define __SOCKETENGINE_SELECT__
@@ -20,31 +17,53 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <sys/select.h>
 #include "inspircd_config.h"
 #include "globals.h"
 #include "inspircd.h"
 #include "socketengine.h"
 
+class InspIRCd;
+
+/** A specialisation of the SocketEngine class, designed to use traditional select().
+ */
 class SelectEngine : public SocketEngine
 {
 private:
-       std::map<int,int> fds;          /* List of file descriptors being monitored */
-       fd_set wfdset, rfdset;          /* Readable and writeable sets for select() */
+       /** Because select() does not track an fd list for us between calls, we have one of our own
+        */
+       std::map<int,int> fds;
+       /** List of writeable ones (WantWrite())
+        */
+       bool writeable[MAX_DESCRIPTORS];
+       /** The read set and write set, populated before each call to select().
+        */
+       fd_set wfdset, rfdset, errfdset;
 public:
-       SelectEngine();
+       /** Create a new SelectEngine
+        * @param Instance The creator of this object
+        */
+       SelectEngine(InspIRCd* Instance);
+       /** Delete a SelectEngine
+        */
        virtual ~SelectEngine();
-       virtual bool AddFd(int fd, bool readable, char type);
+       virtual bool AddFd(EventHandler* eh);
        virtual int GetMaxFds();
        virtual int GetRemainingFds();
-       virtual bool DelFd(int fd);
-       virtual int Wait(int* fdlist);
+       virtual bool DelFd(EventHandler* eh, bool force = false);
+       virtual int DispatchEvents();
        virtual std::string GetName();
+       virtual void WantWrite(EventHandler* eh);
 };
 
+/** Creates a SocketEngine
+ */
 class SocketEngineFactory
 {
 public:
-       SocketEngine* Create() { return new SelectEngine(); }
+       /** Create a new instance of SocketEngine based on SelectEngine
+        */
+       SocketEngine* Create(InspIRCd* Instance) { return new SelectEngine(Instance); }
 };
 
 #endif