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

2 files changed, 5 insertions, 5 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!
diff --git a/include/threadengine.h b/include/threadengine.h
index d7eaaef69..e1400eb95 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -30,8 +30,7 @@ class CoreExport Thread : public Extensible
 	/** Set to true when the thread is to exit
 	 */
 	bool ExitFlag;
-// TODO protected:
- public:
+ protected:
 	/** Get thread's current exit status.
 	 * (are we being asked to exit?)
 	 */