summaryrefslogtreecommitdiff
path: root/include/inspircd.h
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-03-23 20:42:17 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-03-23 20:42:17 +0000
commite7150d29f4897d595c9ee2218e190d6cf42f191b (patch)
treefd63b14d0b940b1c14d2d6989f589ec7dc249222 /include/inspircd.h
parent47a902e1f647fc017560b9a85eaddc64dc29aad8 (diff)
ConfigReaderThread updates: add done flag, remove main-thread-only mutex
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11256 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include/inspircd.h')
-rw-r--r--include/inspircd.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index f32a67644..24b7bc4d1 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -290,9 +290,11 @@ class CoreExport ConfigReaderThread : public Thread
{
InspIRCd* ServerInstance;
bool do_bail;
+ bool done;
std::string TheUserUID;
public:
- ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
+ ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid)
+ : Thread(), ServerInstance(Instance), do_bail(bail), done(false), TheUserUID(useruid)
{
}
@@ -301,6 +303,7 @@ class CoreExport ConfigReaderThread : public Thread
}
void Run();
+ bool IsDone() { return done; }
};
/** The main class of the irc server.
@@ -397,8 +400,6 @@ class CoreExport InspIRCd : public classbase
*/
std::map<BufferedSocket*,BufferedSocket*> SocketCull;
- Mutex RehashFinishMutex;
-
/** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
* Reason for it:
* kludge alert!