Suggested by nenolod, lets add this for thread signal safety

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 85800f4da75736f6f1a0db6fc4231446c95de4db..4e37fae8d99d37436278191df7a07d53585daca8 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -66,7 +66,6 @@ typedef std::vector< KeyVal > KeyValList;
  */
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
-
 #include "inspircd_config.h"
 #include "numerics.h"
 #include "uid.h"
@@ -277,13 +276,16 @@ DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 class XLineManager;
 class BanCacheManager;
 
+/** The background thread for config reading, so that reading from executable includes
+ * does not block.
+ */
 class CoreExport ConfigReaderThread : public Thread
 {
        InspIRCd* ServerInstance;
        bool do_bail;
-       User* TheUser;
+       std::string TheUserUID;
  public:
-       ConfigReaderThread(InspIRCd* Instance, bool bail, User* user) : Thread(), ServerInstance(Instance), do_bail(bail), TheUser(user)
+       ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
        {
        }
 
@@ -446,6 +448,10 @@ class CoreExport InspIRCd : public classbase
         */
        ThreadEngine* Threads;
 
+       /** Mutex engine, handles mutexes for threading where required
+        */
+       MutexFactory* Mutexes;
+
        /** The thread/class used to read config files in REHASH and on startup
         */
        ConfigReaderThread* ConfigThread;
@@ -713,20 +719,21 @@ class CoreExport InspIRCd : public classbase
        void SendMode(const std::vector<std::string>& parameters, User *user);
 
        /** Match two strings using pattern matching, optionally, with a map
-        * to check case against (may be NULL).
+        * to check case against (may be NULL). If map is null, match will be case insensitive.
         * @param str The literal string to match against
         * @param mask The glob pattern to match against.
         */
-       static bool Match(const std::string &str, const std::string &mask, unsigned const char *map);
-       static bool Match(const  char *str, const char *mask, unsigned const char *map);
+       static bool Match(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
+       static bool Match(const  char *str, const char *mask, unsigned const char *map = NULL);
 
        /** Match two strings using pattern matching, optionally, with a map
-        * to check case against (may be NULL). Supports CIDR patterns as well as globs.
+        * to check case against (may be NULL). If map is null, match will be case insensitive.
+        * Supports CIDR patterns as well as globs.
         * @param str The literal string to match against
         * @param mask The glob or CIDR pattern to match against.
         */
-       static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map);
-       static bool MatchCIDR(const  char *str, const char *mask, unsigned const char *map);
+       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