20160409

ldcsaa · zhaowq32 · Dec 24, 2013 · Dec 24, 2013 · Dec 24, 2013 · Dec 24, 2013
commit 5c46195e712e96108cc175c6680af41ac6731109
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_D.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket_D.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_D.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket_D.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_U.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket_U.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_U.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket_U.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_D.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket_D.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_D.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket_D.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_U.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket_U.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_U.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket_U.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4CS/x64/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4CS/x64/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4CS/x86/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4CS/x86/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4E/Lib/HPSocket_4C.lib b/HP-Socket/Bin/HPSocket4E/Lib/HPSocket_4C.lib
diff --git a/HP-Socket/Bin/HPSocket4E/Lib/Hp_Socket.fne b/HP-Socket/Bin/HPSocket4E/Lib/Hp_Socket.fne
diff --git a/HP-Socket/Bin/HPSocket4E/Lib/Hp_Socket_static.lib b/HP-Socket/Bin/HPSocket4E/Lib/Hp_Socket_static.lib
diff --git a/HP-Socket/DLL/HPSocketDLL/HPSocketDLL.suo b/HP-Socket/DLL/HPSocketDLL/HPSocketDLL.suo
diff --git a/HP-Socket/DLL/HPSocketDLL4C/HPSocketDLL4C.suo b/HP-Socket/DLL/HPSocketDLL4C/HPSocketDLL4C.suo
diff --git a/HP-Socket/Demo/HttpProxy/HttpProxy.suo b/HP-Socket/Demo/HttpProxy/HttpProxy.suo
diff --git a/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x64/Debug/HPSocket4C_UD.dll b/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x64/Debug/HPSocket4C_UD.dll
diff --git a/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x64/Release/HPSocket4C_U.dll b/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x64/Release/HPSocket4C_U.dll
diff --git a/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x86/Debug/HPSocket4C_UD.dll b/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x86/Debug/HPSocket4C_UD.dll
diff --git a/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x86/Release/HPSocket4C_U.dll b/HP-Socket/Demo/Other Languages Demos/C#/HPSocket4CS/bin/x86/Release/HPSocket4C_U.dll
diff --git a/HP-Socket/Demo/Release/x64/HPSocket4C_U.dll b/HP-Socket/Demo/Release/x64/HPSocket4C_U.dll
diff --git a/HP-Socket/Demo/Release/x64/HPSocket_U.dll b/HP-Socket/Demo/Release/x64/HPSocket_U.dll
diff --git a/HP-Socket/Demo/Release/x64/HttpProxy-Server.exe b/HP-Socket/Demo/Release/x64/HttpProxy-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-4C-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-4C-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-4C-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-4C-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Agent-4C.exe b/HP-Socket/Demo/Release/x64/TestEcho-Agent-4C.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Agent-PFM.exe b/HP-Socket/Demo/Release/x64/TestEcho-Agent-PFM.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Agent-Pull.exe b/HP-Socket/Demo/Release/x64/TestEcho-Agent-Pull.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Agent-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-Agent-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-PFM-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-PFM-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-PFM-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-PFM-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Pack-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-Pack-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Pack-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-Pack-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Pull-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-Pull-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Pull-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-Pull-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-UDP-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-UDP-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-UDP-PFM-Client.exe b/HP-Socket/Demo/Release/x64/TestEcho-UDP-PFM-Client.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-UDP-PFM-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-UDP-PFM-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestEcho-UDP-Server.exe b/HP-Socket/Demo/Release/x64/TestEcho-UDP-Server.exe
diff --git a/HP-Socket/Demo/Release/x64/TestUDPCast-Member.exe b/HP-Socket/Demo/Release/x64/TestUDPCast-Member.exe
diff --git a/HP-Socket/Demo/Release/x86/HPSocket4C_U.dll b/HP-Socket/Demo/Release/x86/HPSocket4C_U.dll
diff --git a/HP-Socket/Demo/Release/x86/HPSocket_U.dll b/HP-Socket/Demo/Release/x86/HPSocket_U.dll
diff --git a/HP-Socket/Demo/Release/x86/HttpProxy-Server.exe b/HP-Socket/Demo/Release/x86/HttpProxy-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-4C-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-4C-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-4C-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-4C-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Agent-4C.exe b/HP-Socket/Demo/Release/x86/TestEcho-Agent-4C.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Agent-PFM.exe b/HP-Socket/Demo/Release/x86/TestEcho-Agent-PFM.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Agent-Pull.exe b/HP-Socket/Demo/Release/x86/TestEcho-Agent-Pull.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Agent-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-Agent-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-PFM-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-PFM-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-PFM-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-PFM-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Pack-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-Pack-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Pack-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-Pack-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Pull-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-Pull-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Pull-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-Pull-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-UDP-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-UDP-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-UDP-PFM-Client.exe b/HP-Socket/Demo/Release/x86/TestEcho-UDP-PFM-Client.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-UDP-PFM-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-UDP-PFM-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestEcho-UDP-Server.exe b/HP-Socket/Demo/Release/x86/TestEcho-UDP-Server.exe
diff --git a/HP-Socket/Demo/Release/x86/TestUDPCast-Member.exe b/HP-Socket/Demo/Release/x86/TestUDPCast-Member.exe
diff --git a/HP-Socket/Demo/TestEcho-4C/TestEcho-4C.suo b/HP-Socket/Demo/TestEcho-4C/TestEcho-4C.suo
diff --git a/HP-Socket/Demo/TestEcho-Agent/TestEcho-Agent.suo b/HP-Socket/Demo/TestEcho-Agent/TestEcho-Agent.suo
diff --git a/HP-Socket/Demo/TestEcho-PFM/TestEcho-PFM.suo b/HP-Socket/Demo/TestEcho-PFM/TestEcho-PFM.suo
diff --git a/HP-Socket/Demo/TestEcho-Pack/TestEcho-Pack.suo b/HP-Socket/Demo/TestEcho-Pack/TestEcho-Pack.suo
diff --git a/HP-Socket/Demo/TestEcho-Pull/TestEcho-Pull.suo b/HP-Socket/Demo/TestEcho-Pull/TestEcho-Pull.suo
diff --git a/HP-Socket/Demo/TestEcho-UDP-PFM/TestEcho-UDP-PFM.suo b/HP-Socket/Demo/TestEcho-UDP-PFM/TestEcho-UDP-PFM.suo
diff --git a/HP-Socket/Demo/TestEcho-UDP/TestEcho-UDP.suo b/HP-Socket/Demo/TestEcho-UDP/TestEcho-UDP.suo
diff --git a/HP-Socket/Demo/TestEcho/TestEcho.suo b/HP-Socket/Demo/TestEcho/TestEcho.suo
diff --git a/HP-Socket/Demo/TestUDPCast/TestUDPCast.suo b/HP-Socket/Demo/TestUDPCast/TestUDPCast.suo
diff --git a/HP-Socket/Src/TcpAgent.cpp b/HP-Socket/Src/TcpAgent.cpp
@@ -129,6 +129,8 @@ void CTcpAgent::PrepareStart()
 	m_itPool.SetItemCapacity((int)m_dwSocketBufferSize);
 	m_itPool.SetPoolSize((int)m_dwFreeBufferObjPool);
 	m_itPool.SetPoolHold((int)m_dwFreeBufferObjHold);
+
+	m_itPool.Prepare();
 }
 
 BOOL CTcpAgent::CheckStarting()

diff --git a/HP-Socket/Src/TcpClient.cpp b/HP-Socket/Src/TcpClient.cpp
@@ -82,6 +82,8 @@ void CTcpClient::PrepareStart()
 	m_itPool.SetItemCapacity((int)m_dwSocketBufferSize);
 	m_itPool.SetPoolSize((int)m_dwFreeBufferPoolSize);
 	m_itPool.SetPoolHold((int)m_dwFreeBufferPoolHold);
+
+	m_itPool.Prepare();
 }
 
 BOOL CTcpClient::CheckStarting()

diff --git a/HP-Socket/Src/TcpPackAgent.cpp b/HP-Socket/Src/TcpPackAgent.cpp
@@ -46,6 +46,8 @@ void CTcpPackAgent::PrepareStart()
 	m_bfPool.SetBufferLockTime	(GetFreeSocketObjLockTime());
 	m_bfPool.SetBufferPoolSize	(GetFreeSocketObjPool());
 	m_bfPool.SetBufferPoolHold	(GetFreeSocketObjHold());
+
+	m_bfPool.Prepare();
 }
 
 BOOL CTcpPackAgent::SendPackets(CONNID dwConnID, const WSABUF pBuffers[], int iCount)

diff --git a/HP-Socket/Src/TcpPackServer.cpp b/HP-Socket/Src/TcpPackServer.cpp
@@ -46,6 +46,8 @@ void CTcpPackServer::PrepareStart()
 	m_bfPool.SetBufferLockTime	(GetFreeSocketObjLockTime());
 	m_bfPool.SetBufferPoolSize	(GetFreeSocketObjPool());
 	m_bfPool.SetBufferPoolHold	(GetFreeSocketObjHold());
+
+	m_bfPool.Prepare();
 }
 
 BOOL CTcpPackServer::SendPackets(CONNID dwConnID, const WSABUF pBuffers[], int iCount)

diff --git a/HP-Socket/Src/TcpPullAgent.h b/HP-Socket/Src/TcpPullAgent.h
@@ -49,6 +49,8 @@ class CTcpPullAgent : public IPullSocket, public CTcpAgent
 		m_bfPool.SetBufferLockTime	(GetFreeSocketObjLockTime());
 		m_bfPool.SetBufferPoolSize	(GetFreeSocketObjPool());
 		m_bfPool.SetBufferPoolHold	(GetFreeSocketObjHold());
+
+		m_bfPool.Prepare();
 	}
 
 public:

diff --git a/HP-Socket/Src/TcpPullServer.h b/HP-Socket/Src/TcpPullServer.h
@@ -49,6 +49,8 @@ class CTcpPullServer : public IPullSocket, public CTcpServer
 		m_bfPool.SetBufferLockTime	(GetFreeSocketObjLockTime());
 		m_bfPool.SetBufferPoolSize	(GetFreeSocketObjPool());
 		m_bfPool.SetBufferPoolHold	(GetFreeSocketObjHold());
+
+		m_bfPool.Prepare();
 	}
 
 public:

diff --git a/HP-Socket/Src/TcpServer.cpp b/HP-Socket/Src/TcpServer.cpp
@@ -130,6 +130,8 @@ void CTcpServer::PrepareStart()
 	m_itPool.SetItemCapacity((int)m_dwSocketBufferSize);
 	m_itPool.SetPoolSize((int)m_dwFreeBufferObjPool);
 	m_itPool.SetPoolHold((int)m_dwFreeBufferObjHold);
+
+	m_itPool.Prepare();
 }
 
 BOOL CTcpServer::CheckStarting()

diff --git a/HP-Socket/Src/UdpCast.cpp b/HP-Socket/Src/UdpCast.cpp
@@ -84,6 +84,8 @@ void CUdpCast::PrepareStart()
 	m_itPool.SetItemCapacity((int)m_dwMaxDatagramSize);
 	m_itPool.SetPoolSize((int)m_dwFreeBufferPoolSize);
 	m_itPool.SetPoolHold((int)m_dwFreeBufferPoolHold);
+
+	m_itPool.Prepare();
 }
 
 BOOL CUdpCast::CheckStarting()

diff --git a/HP-Socket/Src/UdpClient.cpp b/HP-Socket/Src/UdpClient.cpp
@@ -86,6 +86,8 @@ void CUdpClient::PrepareStart()
 	m_itPool.SetItemCapacity((int)m_dwMaxDatagramSize);
 	m_itPool.SetPoolSize((int)m_dwFreeBufferPoolSize);
 	m_itPool.SetPoolHold((int)m_dwFreeBufferPoolHold);
+
+	m_itPool.Prepare();
 }
 
 BOOL CUdpClient::CheckStarting()

diff --git a/HP-Socket/Src/UdpServer.cpp b/HP-Socket/Src/UdpServer.cpp
@@ -129,6 +129,8 @@ void CUdpServer::PrepareStart()
 	m_itPool.SetItemCapacity((int)m_dwMaxDatagramSize);
 	m_itPool.SetPoolSize((int)m_dwFreeBufferObjPool);
 	m_itPool.SetPoolHold((int)m_dwFreeBufferObjHold);
+
+	m_itPool.Prepare();
 }
 
 BOOL CUdpServer::CheckStarting()