From e7150d29f4897d595c9ee2218e190d6cf42f191b Mon Sep 17 00:00:00 2001 From: danieldg Date: Mon, 23 Mar 2009 20:42:17 +0000 Subject: 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 --- include/inspircd.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/inspircd.h') 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 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! -- cgit v1.2.3