Fixed fd_Setsize in cygwin

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 63c764bbba6c42962df53254c05f2eb3458928cd..14b2abb3ea2e77d7134109d177089f8f9a73687b 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -14,17 +14,25 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
+
 #ifdef USE_KQUEUE
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #endif
+
+#ifdef USE_EPOLL
+#include <sys/epoll.h>
+#endif
+
 #include <time.h>
 #include <string>
 #ifdef GCC3
@@ -52,15 +60,17 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
 #ifdef USE_KQUEUE
 extern int kq;
 #endif
 
+#ifdef USE_EPOLL
+int ep;
+#endif
+
 extern int MODCOUNT;
-extern std::vector<Module*, __single_client_alloc> modules;
-extern std::vector<ircd_module*, __single_client_alloc> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
 
 extern time_t TIME;
 
@@ -88,7 +98,7 @@ extern int NetBufferSize;
 extern int MaxWhoResults;
 extern time_t nb_start;
 
-extern std::vector<std::string, __single_client_alloc> module_names;
+extern std::vector<std::string> module_names;
 
 extern int boundPortCount;
 extern int portCount;
@@ -105,11 +115,11 @@ extern FILE *log_file;
 
 extern userrec* fd_ref_table[65536];
 
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp, __single_client_alloc> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp, __single_client_alloc> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp, __single_client_alloc> address_cache;
-typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp, __single_client_alloc> whowas_hash;
-typedef std::deque<command_t, __single_client_alloc> command_table;
+typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
+typedef std::deque<command_t> command_table;
 
 
 extern user_hash clientlist;
@@ -135,7 +145,7 @@ public:
        ExtMode(char mc, int ty, bool oper, int p_on, int p_off) : modechar(mc), type(ty), needsoper(oper), params_when_on(p_on), params_when_off(p_off) { };
 };                                     
 
-typedef std::vector<ExtMode, __single_client_alloc> ExtModeList;
+typedef std::vector<ExtMode> ExtModeList;
 typedef ExtModeList::iterator ExtModeListIter;
 
 
@@ -621,6 +631,17 @@ bool Server::UserToPseudo(userrec* user,std::string message)
                 log(DEBUG,"kqueue: Failed to remove user from queue!");
         }
 #endif
+#ifdef USE_EPOLL
+        struct epoll_event ev;
+        ev.events = EPOLLIN | EPOLLET;
+        ev.data.fd = old_fd;
+        int i = epoll_ctl(ep, EPOLL_CTL_DEL, old_fd, &ev);
+        if (i < 0)
+        {
+                log(DEBUG,"epoll: List deletion failure!");
+        }
+#endif
+
         shutdown(old_fd,2);
         close(old_fd);
 }