20140812

ldcsaa · hezlog · Dec 24, 2013 · Dec 24, 2013 · Dec 24, 2013 · Dec 24, 2013
commit 0c478d04b0c8b32115e73fbaf15d110a54e17ee5
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,16 @@
+==========================================================================================
+v3.2.3 ���£�
+==========================================================================================
+
+> common-src �Ż���
+-----------------
+1���Ż�ͨ�������ͬ������
+2��������������Լ 10%
+
+> ����˵����
+-----------------
+1��ʹ�� HP-Socket v3.2.2 ����ǰ�汾��Ӧ�ó�����԰�ȫ������ HP-Socket v3.2.3
+
 ==========================================================================================
 v3.2.2 ���£�
 ==========================================================================================

diff --git a/Common/ChangeLog.txt b/Common/ChangeLog.txt
@@ -3,30 +3,37 @@ Module	: vc-common-src
 Desc	: HP-Socket �� VC-Logger �Ĺ��������
 Usage	: ����Ҫ�Ĵ����ļ����뵽��Ŀ��
 
+==========================================================================================
+v2.3.7 ���£�
+==========================================================================================
+
+1���޸� CriticalSection.h
+	1) ���� CSpinLock��CSpinGuard
+	2) ���� CInterCriSec ��Ĭ�� Spin Count Ϊ 4000
+2���޸� RWLock.h
+	1) �� CSpinLock ȡ�� CInterCriSec ��Ϊ CRWLock �� CSWMR ��ͬ����
+	2) ���� ICVCondition/CCVGuardCS/CCVGuardSRW ���࣬����ʵ��������-������ģ��
+3������ RingBuffer.h/.cpp�������ܶ�д������
+4������ Thread.h/.cpp���̷߳�װ��
+
 ==========================================================================================
 v2.3.6 ���£�
 ==========================================================================================
 
-> �ֲ����������
------------------
 1���޸� RWLock.h������ VS 2005/2008
 2���޸� bufferpool.cpp��memmove() �滻Ϊ memcpy()
 
 ==========================================================================================
 v2.3.5 ���£�
 ==========================================================================================
 
-> �ֲ����������
------------------
 1���޸� STLHelper.h������ unordered_set / unordered_map ����
 2���޸� bufferpool.h��TBufferPtrMap ����Ϊ unordered_map
 
 ==========================================================================================
 v2.3.4 ���£�
 ==========================================================================================
 
-> �ֲ����������
------------------
 1���޸� RWLock.h�����ӷ������д�� CSlimLock
 2���޸� bufferpool.h/bufferpool.cpp�������� TItemListEx
 3������ SysHelper.h/SysHelper.cpp���ṩ��ȡϵͳ��Ϣ�İ�������
@@ -35,46 +42,32 @@ v2.3.4
 v2.3.3 ���£�
 ==========================================================================================
 
-> �ֲ����������
------------------
 1���޸� bufferpool.cpp���Ż� CBufferPool��TItemList
 2���޸� STLHelper.h������ stack��queue��deque �Ļ������� typedef ����
 3���޸� FuncHelper.h��FuncHelper.cpp������ VS 2013
-
-> ���� _WIN32_WINNT Ĭ��ֵ��
------------------
-1���޸� GeneralHelper.h
+4���޸� GeneralHelper.h
 	1) 32 λϵͳ _WIN32_WINNT Ĭ��ֵ��_WIN32_WINNT_WINXP
 	2) 64 λϵͳ _WIN32_WINNT Ĭ��ֵ��_WIN32_WINNT_WIN7
 
 ==========================================================================================
 v2.3.2 ���£�
 ==========================================================================================
 
-> ���� Buffer Pool ������ TItem/TItemList/TBuffer/CItemPool/CBufferPool��
------------------
 1������ bufferpool.h
 2������ bufferpool.cpp
 
 ==========================================================================================
 v2.3.1 ���£�
 ==========================================================================================
 
-> ���Ӷ�д�������� CSWMR �� CRWLock��
------------------
 1������ RWLock.h
 2������ RWLock.cpp
-
-> �������£�
------------------
-1��ɾ�� CMTX/CSEM/CEvent ��ġ�operator HANDLE* &()�����������
-2���޸� WaitFor.cpp���Ż���GetTimeGap32()������
+3��ɾ�� CMTX/CSEM/CEvent ��ġ�operator HANDLE* &()�����������
+4���޸� WaitFor.cpp���Ż���GetTimeGap32()������
 
 ==========================================================================================
 v2.2.2 ���£�
 ==========================================================================================
 
-> �Ż��� Win32 ���򣨷� MFC ���򣩵ļ����ԣ�
------------------
 1���޸� GeneralHelper.h
 2���޸� FuncHelper.cpp
diff --git a/Common/License.txt b/Common/License.txt
@@ -1,7 +1,7 @@
 /*
  * Copyright JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.6
+ * Version	: 2.3.7
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/CriticalSection.cpp b/Common/Src/CriticalSection.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.5
+ * Version	: 2.3.7
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa
@@ -21,17 +21,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/****************************************************************************
-*																			*
-* CriticalSection.cpp 														*
-*																			*
-* Create by :																*
-* Kingfisher	2003-10-15													*
-* 																			*
-* Description: 																*
-* ��װWin32�ٽ�������ͻ������ں˶���										*
-****************************************************************************/
 
 #include "stdafx.h"
 #include "CriticalSection.h"
diff --git a/Common/Src/CriticalSection.h b/Common/Src/CriticalSection.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.5
+ * Version	: 2.3.7
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa
@@ -21,52 +21,64 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/****************************************************************************
-*																			*
-* CriticalSection.h 														*
-*																			*
-* Create by :																*
-* Kingfisher	2003-10-15													*
-* 																			*
-* Description: 																*
-* ��װWin32�ٽ�������ͻ������ں˶���											*
-****************************************************************************/
 
 #pragma once
 
-class CCriSec
+#include <intrin.h>
+
+#define DEFAULT_CRISEC_SPIN_COUNT	4096
+
+#if defined (_WIN64)
+	#define DEFAULT_PAUSE_YIELD		32
+	#define DEFAULT_PAUSE_CYCLE		8192
+#else
+	#define DEFAULT_PAUSE_YIELD		8
+	#define DEFAULT_PAUSE_CYCLE		4096
+#endif
+
+#ifndef YieldProcessor
+	#pragma intrinsic(_mm_pause)
+	#define YieldProcessor _mm_pause
+#endif
+
+class CInterCriSec
 {
 public:
-	CCriSec()		{::InitializeCriticalSection(&m_crisec);}
-	~CCriSec()		{::DeleteCriticalSection(&m_crisec);}
+	CInterCriSec(DWORD dwSpinCount = DEFAULT_CRISEC_SPIN_COUNT)
+		{VERIFY(::InitializeCriticalSectionAndSpinCount(&m_crisec, dwSpinCount));}
+	~CInterCriSec()
+		{::DeleteCriticalSection(&m_crisec);}
 
-	void Lock()		{::EnterCriticalSection(&m_crisec);}
-	void Unlock()	{::LeaveCriticalSection(&m_crisec);}
+	void Lock()								{::EnterCriticalSection(&m_crisec);}
+	void Unlock()							{::LeaveCriticalSection(&m_crisec);}
+	BOOL TryLock()							{return ::TryEnterCriticalSection(&m_crisec);}
+	DWORD SetSpinCount(DWORD dwSpinCount)	{return ::SetCriticalSectionSpinCount(&m_crisec, dwSpinCount);}
+
+	CRITICAL_SECTION* GetObject()			{return &m_crisec;}
 
 private:
-	CCriSec(const CCriSec& cs);
-	CCriSec operator = (const CCriSec& cs);
+	CInterCriSec(const CInterCriSec& cs);
+	CInterCriSec operator = (const CInterCriSec& cs);
 
 private:
-	CRITICAL_SECTION    m_crisec;
+	CRITICAL_SECTION m_crisec;
 };
 
-class CCriSec2
+class CInterCriSec2
 {
 public:
-	CCriSec2(BOOL bInitialize = TRUE)
+	CInterCriSec2(DWORD dwSpinCount = DEFAULT_CRISEC_SPIN_COUNT, BOOL bInitialize = TRUE)
 	{
 		if(bInitialize)
 		{
 			m_pcrisec = new CRITICAL_SECTION;
-			::InitializeCriticalSection(m_pcrisec);
+			VERIFY(::InitializeCriticalSectionAndSpinCount(m_pcrisec, dwSpinCount));
 		}
 		else
 			m_pcrisec = nullptr;
 	}
 
-	~CCriSec2() {Reset();}
+	~CInterCriSec2() {Reset();}
 
 	void Attach(CRITICAL_SECTION* pcrisec)
 	{
@@ -81,12 +93,16 @@ class CCriSec2
 		return pcrisec;
 	}
 
-	void Lock()		{::EnterCriticalSection(m_pcrisec);}
-	void Unlock()	{::LeaveCriticalSection(m_pcrisec);}
+	void Lock()								{::EnterCriticalSection(m_pcrisec);}
+	void Unlock()							{::LeaveCriticalSection(m_pcrisec);}
+	BOOL TryLock()							{return ::TryEnterCriticalSection(m_pcrisec);}
+	DWORD SetSpinCount(DWORD dwSpinCount)	{return ::SetCriticalSectionSpinCount(m_pcrisec, dwSpinCount);}
+
+	CRITICAL_SECTION* GetObject()			{return m_pcrisec;}
 
 private:
-	CCriSec2(const CCriSec2& cs);
-	CCriSec2 operator = (const CCriSec2& cs);
+	CInterCriSec2(const CInterCriSec2& cs);
+	CInterCriSec2 operator = (const CInterCriSec2& cs);
 
 	void Reset()
 	{
@@ -99,7 +115,7 @@ class CCriSec2
 	}
 
 private:
-	CRITICAL_SECTION*    m_pcrisec;
+	CRITICAL_SECTION* m_pcrisec;
 };
 
 class CMTX
@@ -141,6 +157,92 @@ class CMTX
 	HANDLE m_hMutex;
 };
 
+class CSpinGuard
+{
+public:
+	CSpinGuard()
+	: m_dwThreadID	(0)
+	, m_iCount		(0)
+	{
+
+	}
+
+	~CSpinGuard()
+	{
+		ASSERT(m_dwThreadID	== 0);
+		ASSERT(m_iCount		== 0);
+	}
+
+	void Lock()
+	{
+		for(UINT i = 0; !_TryLock(i == 0); i++)
+			Pause(i);
+	}
+
+	BOOL TryLock()
+	{
+		return _TryLock(TRUE);
+	}
+
+	void Unlock()
+	{
+		DWORD dwCurrentThreadID = ::GetCurrentThreadId();
+
+		if(m_dwThreadID == dwCurrentThreadID)
+		{
+			if((--m_iCount) == 0)
+				m_dwThreadID = 0;
+		}
+	}
+
+	static void Pause(UINT i)
+	{
+		if		(i < DEFAULT_PAUSE_YIELD)		YieldProcessor();
+		else if	(i < DEFAULT_PAUSE_CYCLE - 1)	SwitchToThread();
+		else if	(i < DEFAULT_PAUSE_CYCLE)		Sleep(1);
+		else									Pause(i & (DEFAULT_PAUSE_CYCLE - 1));
+	}
+
+private:
+	CSpinGuard(const CSpinGuard& cs);
+	CSpinGuard operator = (const CSpinGuard& cs);
+
+	BOOL _TryLock(BOOL bFirst)
+	{
+		DWORD dwCurrentThreadID = ::GetCurrentThreadId();
+
+		if(bFirst && m_dwThreadID == dwCurrentThreadID)
+		{
+			++m_iCount;
+			return TRUE;
+		}
+
+		if(::InterlockedCompareExchange((volatile LONG*)&m_dwThreadID, dwCurrentThreadID, 0) == 0)
+		{
+			::_ReadWriteBarrier();
+			ASSERT(m_iCount == 0);
+
+			m_iCount = 1;
+
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+private:
+	volatile DWORD m_dwThreadID;
+	int m_iCount;
+};
+
+class CFakeGuard
+{
+public:
+	void Lock()		{}
+	void Unlock()	{}
+	BOOL TryLock()	{return TRUE;}
+};
+
 template<class CLockObj> class CLocalLock
 {
 public:
@@ -150,6 +252,11 @@ template<class CLockObj> class CLocalLock
 	CLockObj& m_lock;
 };
 
-typedef CLocalLock<CCriSec>		CCriSecLock;
-typedef CLocalLock<CCriSec2>	CCriSecLock2;
-typedef CLocalLock<CMTX>		CMutexLock;
+typedef CInterCriSec				CCriSec;
+
+typedef CLocalLock<CCriSec>			CCriSecLock;
+typedef CLocalLock<CInterCriSec>	CInterCriSecLock;
+typedef CLocalLock<CInterCriSec2>	CInterCriSecLock2;
+typedef CLocalLock<CMTX>			CMutexLock;
+typedef CLocalLock<CSpinGuard>		CSpinLock;
+typedef	CLocalLock<CFakeGuard>		CFakeLock;