Stop recreating hashmaps every hour, move garbage collection code related to local...

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 054b7c148c10dc6cc39cc59504af7fd9d3f99a34..2e1cfbd21307270da775b569151136795c1e715b 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -67,6 +67,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef _WIN32
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+#endif
 #include <sstream>
 #include <string>
 #include <vector>
@@ -121,11 +126,6 @@ CoreExport extern InspIRCd* ServerInstance;
  */
 #define ERROR -1
 
-/** Support for librodent -
- * see http://www.chatspike.net/index.php?z=64
- */
-#define ETIREDHAMSTERS EAGAIN
-
 /** Template function to convert any input type to std::string
  */
 template<typename T> inline std::string ConvNumeric(const T &in)
@@ -268,12 +268,10 @@ class serverstats
        }
 };
 
-DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
+DEFINE_HANDLER2(IsNickHandler, bool, const std::string&, size_t);
 DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
-DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
-DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
-DEFINE_HANDLER2(IsChannelHandler, bool, const char*, size_t);
-DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&);
+DEFINE_HANDLER1(IsIdentHandler, bool, const std::string&);
+DEFINE_HANDLER2(IsChannelHandler, bool, const std::string&, size_t);
 DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
 
@@ -341,10 +339,8 @@ class CoreExport InspIRCd
 
        IsNickHandler HandleIsNick;
        IsIdentHandler HandleIsIdent;
-       FloodQuitUserHandler HandleFloodQuitUser;
        OnCheckExemptionHandler HandleOnCheckExemption;
        IsChannelHandler HandleIsChannel;
-       IsSIDHandler HandleIsSID;
        RehashHandler HandleRehash;
        GenRandomHandler HandleGenRandom;
 
@@ -575,12 +571,12 @@ class CoreExport InspIRCd
         * @param chname A channel name to verify
         * @return True if the name is valid
         */
-       caller2<bool, const char*, size_t> IsChannel;
+       caller2<bool, const std::string&, size_t> IsChannel;
 
        /** Return true if str looks like a server ID
         * @param string to check against
         */
-       caller1<bool, const std::string&> IsSID;
+       static bool IsSID(const std::string& sid);
 
        /** Rehash the local server
         */
@@ -623,13 +619,13 @@ class CoreExport InspIRCd
         * @param n A nickname to verify
         * @return True if the nick is valid
         */
-       caller2<bool, const char*, size_t> IsNick;
+       caller2<bool, const std::string&, size_t> IsNick;
 
        /** Return true if an ident is valid
         * @param An ident to verify
         * @return True if the ident is valid
         */
-       caller1<bool, const char*> IsIdent;
+       caller1<bool, const std::string&> IsIdent;
 
        /** Add a dns Resolver class to this server's active set
         * @param r The resolver to add
@@ -693,22 +689,6 @@ class CoreExport InspIRCd
        static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
        static bool MatchCIDR(const  char *str, const char *mask, unsigned const char *map = NULL);
 
-       /** Call the handler for a given command.
-        * @param commandname The command whos handler you wish to call
-        * @param parameters The mode parameters
-        * @param user The user to execute the command as
-        * @return True if the command handler was called successfully
-        */
-       CmdResult CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user);
-
-       /** Return true if the command is a module-implemented command and the given parameters are valid for it
-        * @param commandname The command name to check
-        * @param pcnt The parameter count
-        * @param user The user to test-execute the command as
-        * @return True if the command handler is a module command, and there are enough parameters and the user has permission to the command
-        */
-       bool IsValidModuleCommand(const std::string &commandname, int pcnt, User* user);
-
        /** Return true if the given parameter is a valid nick!user\@host mask
         * @param mask A nick!user\@host masak to match against
         * @return True i the mask is valid
@@ -755,7 +735,7 @@ class CoreExport InspIRCd
         * (one year, two weeks, three days, four hours, six minutes and five seconds)
         * @return The total number of seconds
         */
-       long Duration(const std::string &str);
+       static unsigned long Duration(const std::string& str);
 
        /** Attempt to compare a password to a string from the config file.
         * This will be passed to handling modules which will compare the data
@@ -821,12 +801,6 @@ class CoreExport InspIRCd
         */
        void DoWhois(User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick);
 
-       /** Quit a user for excess flood, and if they are not
-        * fully registered yet, temporarily zline their IP.
-        * @param current user to quit
-        */
-       caller1<void, User*> FloodQuitUser;
-
        /** Called to check whether a channel restriction mode applies to a user
         * @param User that is attempting some action
         * @param Channel that the action is being performed on
@@ -848,12 +822,6 @@ class CoreExport InspIRCd
         */
        void Cleanup();
 
-       /** This copies the user and channel hash_maps into new hash maps.
-        * This frees memory used by the hash_map allocator (which it neglects
-        * to free, most of the time, using tons of ram)
-        */
-       void RehashUsersAndChans();
-
        /** Resets the cached max bans value on all channels.
         * Called by rehash.
         */
@@ -905,3 +873,4 @@ class CommandModule : public Module
 };
 
 #endif
+