up

kbengine · kbengine · commit 4c166a41ce0d · 2014-08-18T13:25:27.000+08:00
diff --git a/kbe/src/lib/cstdkbe/objectpool.hpp b/kbe/src/lib/cstdkbe/objectpool.hpp
@@ -30,6 +30,7 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 #include <map>	
 #include <list>	
 #include <vector>
+#include <queue> 
 
 #include "thread/threadmutex.hpp"
 
@@ -213,6 +214,23 @@ class ObjectPool
 		mutex_.unlockMutex();
 	}
 
+	/**
+		����һ����������
+	*/
+	void reclaimObject(std::queue<T*>& objs)
+	{
+		mutex_.lockMutex();
+		
+		while(!objs.empty())
+		{
+			T* t = objs.back();
+			objs.pop();
+			reclaimObject_(t);
+		}
+
+		mutex_.unlockMutex();
+	}
+
 	size_t size(void)const{ return obj_count_; }
 	
 	std::string c_str()
diff --git a/kbe/src/lib/helper/debug_helper.cpp b/kbe/src/lib/helper/debug_helper.cpp
@@ -268,13 +268,12 @@ void DebugHelper::clearBufferedLog(bool destroy)
 
 	if(destroy)
 	{
-		std::list< Mercury::Bundle* >::iterator iter = bufferedLogPackets_.begin();
-		for(; iter != bufferedLogPackets_.end(); iter++)
+		while(!bufferedLogPackets_.empty())
 		{
-			delete (*iter);
+			Mercury::Bundle* pBundle = bufferedLogPackets_.back();
+			bufferedLogPackets_.pop();
+			delete pBundle;
 		}
-
-		bufferedLogPackets_.clear();
 	}
 	else
 	{
@@ -337,16 +336,17 @@ void DebugHelper::sync()
 	uint32 i = 0;
 	size_t totalLen = 0;
 
-	std::list< Mercury::Bundle* >::iterator iter = bufferedLogPackets_.begin();
-	for(; iter != bufferedLogPackets_.end();)
+	while(!bufferedLogPackets_.empty())
 	{
 		if(i++ >= g_kbeSrvConfig.tickMaxSyncLogs() || totalLen > (PACKET_MAX_SIZE_TCP * 10))
 			break;
 		
-		totalLen += (*iter)->currMsgLength();
-		pMessagelogChannel->send((*iter));
+		Mercury::Bundle* pBundle = bufferedLogPackets_.back();
+		bufferedLogPackets_.pop();
+
+		totalLen += pBundle->currMsgLength();
+		pMessagelogChannel->send(pBundle);
 		
-		bufferedLogPackets_.erase(iter++); 
 		--hasBufferedLogPackets_;
 	}
 
@@ -439,7 +439,7 @@ void DebugHelper::onMessage(uint32 logType, const char * str, uint32 length)
 	(*pBundle) << str;
 	
 	++hasBufferedLogPackets_;
-	bufferedLogPackets_.push_back(pBundle);
+	bufferedLogPackets_.push(pBundle);
 
 	Mercury::g_trace_packet = v;
 	g_pDebugHelperSyncHandler->startActiveTick();
diff --git a/kbe/src/lib/helper/debug_helper.hpp b/kbe/src/lib/helper/debug_helper.hpp
@@ -25,7 +25,7 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 #include <assert.h>
 #include <time.h>	
 #include <stdarg.h> 
-#include <list> 
+#include <queue> 
 #if defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 )
 #pragma warning(disable:4819)
 #endif
@@ -178,7 +178,7 @@ class DebugHelper  : public Singleton<DebugHelper>
 	Mercury::Address messagelogAddr_;
 	KBEngine::thread::ThreadMutex logMutex;
 
-	std::list< Mercury::Bundle* > bufferedLogPackets_;
+	std::queue< Mercury::Bundle* > bufferedLogPackets_;
 	size_t hasBufferedLogPackets_;
 
 	Mercury:: NetworkInterface* pNetworkInterface_;
