Merge pull request #38 from jay602/master

插件发送消息可能泄露 #998

Author: kebiao

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/Bundle.cpp

@@ -4,6 +4,9 @@
 #include "Messages.h"
 #include "NetworkInterfaceBase.h"
 #include "KBDebug.h"
+#include "ObjectPool.h"
+
+static ObjectPool<Bundle> _g_bundlePool;
 
 Bundle::Bundle():
 	pCurrPacket_(NULL),
@@ -18,18 +21,29 @@ Bundle::Bundle():
 
 Bundle::~Bundle()
 {
-	MemoryStream::reclaimObject(pCurrPacket_);
-	pCurrPacket_ = NULL;
+	if (pCurrPacket_)
+	{
+		delete pCurrPacket_;
+		pCurrPacket_ = NULL;
+	}
+
+	for (int i = 0; i < streams_.Num(); ++i)
+	{
+		delete streams_[i];
+	}
+
+	streams_.Empty();
 }
 
 Bundle* Bundle::createObject()
 {
-	return new Bundle();
+	return _g_bundlePool.createObject();
 }
 
 void Bundle::reclaimObject(Bundle* obj)
 {
-	delete obj;
+	obj->clear();
+	_g_bundlePool.reclaimObject(obj);
 }
 
 void Bundle::newMessage(Message* pMsg)
@@ -87,17 +101,6 @@ void Bundle::send(NetworkInterfaceBase* pNetworkInterface)
 		ERROR_MSG("Bundle::send(): networkInterface invalid!");
 	}
 
-	// 把不用的MemoryStream放回缓冲池，以减少垃圾回收的消耗
-	for (int i = 0; i < streams_.Num(); ++i)
-	{
-		MemoryStream::reclaimObject(streams_[i]);
-	}
-
-	streams_.Empty();
-
-	if(pCurrPacket_)
-		pCurrPacket_->clear(true);
-
 	// 我们认为，发送完成，就视为这个bundle不再使用了，
 	// 所以我们会把它放回对象池，以减少垃圾回收带来的消耗，
 	// 如果需要继续使用，应该重新Bundle.createObject()，
@@ -135,6 +138,28 @@ void Bundle::checkStream(uint32 v)
 	messageLength_ += v;
 }
 
+void Bundle::clear()
+{
+	// 把不用的MemoryStream放回缓冲池，以减少垃圾回收的消耗
+	for (int i = 0; i < streams_.Num(); ++i)
+	{
+		if(pCurrPacket_ != streams_[i])
+			MemoryStream::reclaimObject(streams_[i]);
+	}
+	
+	streams_.Empty();
+
+	if (pCurrPacket_)
+		pCurrPacket_->clear(false);
+	else
+		pCurrPacket_ = MemoryStream::createObject();
+
+	numMessage_ = 0;
+	messageLength_ = 0;
+	pMsgtype_ = NULL;
+	curMsgStreamIndex_ = 0;
+}
+
 Bundle &Bundle::operator<<(uint8 value)
 {
 	checkStream(sizeof(uint8));

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/Bundle.h

@@ -31,6 +31,8 @@ class KBENGINEPLUGINS_API Bundle
 
 	void checkStream(uint32 v);
 
+	void clear();
+
 public:
 	Bundle &operator<<(uint8 value);
 	Bundle &operator<<(uint16 value);

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/MemoryStream.cpp

@@ -1,15 +1,19 @@
 
 #include "MemoryStream.h"
 #include "KBDebug.h"
+#include "ObjectPool.h"
+
+static ObjectPool<MemoryStream> _g_memoryStreamPool;
 
 MemoryStream* MemoryStream::createObject()
 {
-	return new MemoryStream();
+	return _g_memoryStreamPool.createObject();
 }
 
 void MemoryStream::reclaimObject(MemoryStream* obj)
 {
-	delete obj;
+	obj->clear(false);
+	_g_memoryStreamPool.reclaimObject(obj);
 }
 
 void MemoryStream::print_storage()

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/ObjectPool.h

@@ -0,0 +1,41 @@
+#pragma once
+
+template<typename T>
+class ObjectPool
+{
+public:
+	~ObjectPool()
+	{
+		while (objects_.Num() > 0)
+		{
+			TDoubleLinkedList< T* >::TDoubleLinkedListNode* node = objects_.GetHead();
+			T* t = node->GetValue();
+			delete t;
+			objects_.RemoveNode(node);
+		}
+	}
+
+	T* createObject()
+	{
+		if (objects_.Num() > 0)
+		{
+			TDoubleLinkedList< T* >::TDoubleLinkedListNode* node = objects_.GetHead();
+			T* t = node->GetValue();
+			objects_.RemoveNode(node);
+			return t;
+		} 
+		else
+		{
+			T* t = new T();
+			return t;
+		}
+	}
+
+	void reclaimObject(T* obj)
+	{
+		objects_.AddTail(obj);
+	}
+
+private:
+	TDoubleLinkedList< T* > objects_;
+};