Author: githubbadguy

Server/Server/Singleton.h

@@ -1,14 +1,14 @@
 #ifndef _SINGLETON_H_FILE
 #define _SINGLETON_H_FILE
 #include "CriticalSection.h"
+#include "Lock.h"
 
 template<typename T>
-class Singleton : CriticalSection
+class Singleton
 {
 private:
-	Singleton(){};
 	static T* _Instance;
-
+	static CriticalSection _CS;
 	class MyClass
 	{
 	public:
@@ -21,13 +21,15 @@ class Singleton : CriticalSection
 		}
 	};
 	static MyClass _Harmonior;
+protected:
+	Singleton(){};
 public:
 	virtual ~Singleton(){};
 	static T* GetInstance()
 	{
 		if (_Instance == nullptr)
 		{
-			Lock(this);
+			Lock l(&_CS);
 			if (_Instance == nullptr)
 			{
 				_Instance = new T();
@@ -39,7 +41,10 @@ class Singleton : CriticalSection
 };
 
 template <typename T>
-T Singleton<T>::_Instance = nullptr;
+T* Singleton<T>::_Instance = nullptr;
+
+template <typename T>
+CriticalSection Singleton<T>::_CS;
 
 
 #endif // !_SINGLETON_H_FILE

Server/Server/Thread.cpp

@@ -11,10 +11,6 @@ Thread::Thread() :
 Thread::~Thread()
 {
 }
-bool Thread::IsRunning() const
-{
-	return _IsRunning;
-}
 void Thread::Init(IRunnable *runfuc)
 {
 	assert(_Runnable == nullptr || runfuc != nullptr);
@@ -55,9 +51,9 @@ DWORD Thread::ThreadFunc(void* p)
 	Thread* pThread = static_cast<Thread*>(p);
 	if (pThread != nullptr)
 	{
+		IRunnable* runnable = pThread->_Runnable;
 		while (pThread->_IsRunning)
 		{
-			IRunnable* runnable = pThread->_Runnable;
 			runnable->Run();
 		}
 	}

Server/Server/Thread.h

@@ -16,7 +16,10 @@ class Thread
 	void Suspend();
 	void Resume();
 	void Stop();
-	inline bool IsRunning() const;
+	inline bool IsRunning() const
+	{
+		return _IsRunning;
+	}
 protected:
 	static DWORD _stdcall ThreadFunc(void* p);
 };