20160830

yph0011 · Aug 30, 2016 · 0f29c34 · 0f29c34
1 parent f848078
commit 0f29c34
Show file tree

Hide file tree

Showing 351 changed files with 492 additions and 396 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,29 @@
+==========================================================================================
+v3.5.4 ���£�
+==========================================================================================
+
+> Bug �޸���
+-----------------
+1���޸� IClient ��������ӷ�������ʱ���ӱ��Ͽ����ܵ��³������ Bug
+2���Ż� vc-common-src ����������� CCASQueue
+
+> ����˵����
+-----------------
+1��HP-Socket v3.5.4 ��ȫ���� HP-Socket v3.5.3 �汾������ֱ���滻����
+
+==========================================================================================
+v3.5.3 ���£�
+==========================================================================================
+
+> Bug �޸���
+-----------------
+1���޸� IClient ����ڼ�������´������� OnClose() �¼� Bug
+2���޸� IClient ����ڼ������������ IClient �����³������ Bug
+
+> ����˵����
+-----------------
+1��HP-Socket v3.5.3 ��ȫ���� HP-Socket v3.5.2 �汾������ֱ���滻����
+
 ==========================================================================================
 v3.5.2 ���£�
 ==========================================================================================

diff --git a/Common/ChangeLog.txt b/Common/ChangeLog.txt
@@ -3,11 +3,17 @@ Module	: vc-common-src
 Desc	: HP-Socket �� VC-Logger �Ĺ��������
 Usage	: ����Ҫ�Ĵ����ļ����뵽��Ŀ��
 
+==========================================================================================
+v2.3.14 ���£�
+==========================================================================================
+
+1���޸� RingBuffer.cpp���޸� CCASQueue �����ڶ���������߳�ʱ�����쳣 Bug
+
 ==========================================================================================
 v2.3.13 ���£�
 ==========================================================================================
 
-1���޸� bufferpool.pp���޸� CBufferPool::PutFreeBuffer(TBuffer* pBuffer) û����� Map Bug
+1���޸� bufferpool.cpp���޸� CBufferPool::PutFreeBuffer(TBuffer* pBuffer) û����� Map Bug
 
 ==========================================================================================
 v2.3.12 ���£�

diff --git a/Common/License.txt b/Common/License.txt
@@ -1,7 +1,7 @@
 /*
  * Copyright JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * 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.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

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.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa
@@ -33,10 +33,12 @@
 #define DEFAULT_CRISEC_SPIN_COUNT	4096
 
 #if defined (_WIN64)
-	#define DEFAULT_PAUSE_YIELD		32
+	#define DEFAULT_PAUSE_RETRY		16
+	#define DEFAULT_PAUSE_YIELD		128
 	#define DEFAULT_PAUSE_CYCLE		8192
 #else
-	#define DEFAULT_PAUSE_YIELD		8
+	#define DEFAULT_PAUSE_RETRY		4
+	#define DEFAULT_PAUSE_YIELD		32
 	#define DEFAULT_PAUSE_CYCLE		4096
 #endif
 
@@ -45,6 +47,15 @@
 	#define YieldProcessor _mm_pause
 #endif
 
+static inline void YieldThread(UINT i = DEFAULT_PAUSE_RETRY)
+{
+	if		(i < DEFAULT_PAUSE_RETRY)		;
+	else if	(i < DEFAULT_PAUSE_YIELD)		YieldProcessor();
+	else if	(i < DEFAULT_PAUSE_CYCLE - 1)	SwitchToThread();
+	else if	(i < DEFAULT_PAUSE_CYCLE)		Sleep(1);
+	else									YieldThread(i & (DEFAULT_PAUSE_CYCLE - 1));
+}
+
 class CInterCriSec
 {
 public:
@@ -177,7 +188,7 @@ class CSpinGuard
 	void Lock()
 	{
 		for(UINT i = 0; !TryLock(); ++i)
-			Pause(i);
+			YieldThread(i);
 	}
 
 	BOOL TryLock()
@@ -197,14 +208,6 @@ class CSpinGuard
 		m_lFlag = 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);
@@ -232,7 +235,7 @@ class CReentrantSpinGuard
 	void Lock()
 	{
 		for(UINT i = 0; !_TryLock(i == 0); ++i)
-			Pause(i);
+			YieldThread(i);
 	}
 
 	BOOL TryLock()
@@ -248,14 +251,6 @@ class CReentrantSpinGuard
 			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:
 	CReentrantSpinGuard(const CReentrantSpinGuard& cs);
 	CReentrantSpinGuard operator = (const CReentrantSpinGuard& cs);

diff --git a/Common/Src/Event.cpp b/Common/Src/Event.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Event.h b/Common/Src/Event.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/FuncHelper.cpp b/Common/Src/FuncHelper.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/FuncHelper.h b/Common/Src/FuncHelper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/GeneralHelper.cpp b/Common/Src/GeneralHelper.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/GeneralHelper.h b/Common/Src/GeneralHelper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/PrivateHeap.cpp b/Common/Src/PrivateHeap.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/PrivateHeap.h b/Common/Src/PrivateHeap.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/RWLock.cpp b/Common/Src/RWLock.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/RWLock.h b/Common/Src/RWLock.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/RingBuffer.cpp b/Common/Src/RingBuffer.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/SE.h b/Common/Src/SE.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/STLHelper.h b/Common/Src/STLHelper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa
@@ -47,8 +47,8 @@
 	#include <hash_set>
 	#include <hash_map>
 
-	#define unorderedhash_set	hash_set
-	#define unordered_map		hash_map
+	#define unordered_set	hash_set
+	#define unordered_map	hash_map
 #endif
 
 

diff --git a/Common/Src/Semaphore.cpp b/Common/Src/Semaphore.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Semaphore.h b/Common/Src/Semaphore.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Singleton.h b/Common/Src/Singleton.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/SysHelper.cpp b/Common/Src/SysHelper.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/SysHelper.h b/Common/Src/SysHelper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Thread.cpp b/Common/Src/Thread.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Thread.h b/Common/Src/Thread.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/WaitFor.cpp b/Common/Src/WaitFor.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/WaitFor.h b/Common/Src/WaitFor.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Win32Helper.h b/Common/Src/Win32Helper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.13
+ * Version	: 2.3.14
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa