增加一些watch。

kbengine · kbengine · commit 821fa96e6aa0 · 2014-08-12T17:44:21.000+08:00
diff --git a/kbe/src/server/dbmgr/buffered_dbtasks.cpp b/kbe/src/server/dbmgr/buffered_dbtasks.cpp
@@ -163,5 +163,50 @@ EntityDBTask* Buffered_DBTasks::tryGetNextTask(EntityDBTask* pTask)
 	return pNextTask;
 }
 
+//-------------------------------------------------------------------------------------
+std::string Buffered_DBTasks::printBuffered_dbid()
+{
+	std::string ret;
+	mutex_.lockMutex();
+
+    for (DBID_TASKS_MAP::iterator iter = dbid_tasks_.begin(); iter != dbid_tasks_.end(); iter = dbid_tasks_.upper_bound(iter->first))  
+    {  
+        std::pair<DBID_TASKS_MAP::iterator, DBID_TASKS_MAP::iterator> res = dbid_tasks_.equal_range(iter->first);  
+		int count = 0;
+
+        for (DBID_TASKS_MAP::iterator i = res.first; i != res.second; ++i)  
+        {  
+			++count;
+        } 
+
+		ret += (boost::format("%1%:%2%, ") % iter->first % count).str();
+    }  
+
+	mutex_.unlockMutex();
+	return ret;
+}
+
+//-------------------------------------------------------------------------------------
+std::string Buffered_DBTasks::printBuffered_entityID()
+{
+	std::string ret;
+	mutex_.lockMutex();
+
+    for (ENTITYID_TASKS_MAP::iterator iter = entityid_tasks_.begin(); iter != entityid_tasks_.end(); iter = entityid_tasks_.upper_bound(iter->first))  
+    {  
+		int count = 0;
+        std::pair<ENTITYID_TASKS_MAP::iterator, ENTITYID_TASKS_MAP::iterator> res = entityid_tasks_.equal_range(iter->first);  
+        for (ENTITYID_TASKS_MAP::iterator i = res.first; i != res.second; ++i)  
+        {  
+			++count;
+        }  
+
+		ret += (boost::format("%1%:%2%, ") % iter->first % count).str();
+    }  
+
+	mutex_.unlockMutex();
+	return ret;
+}
+
 //-------------------------------------------------------------------------------------
 }
diff --git a/kbe/src/server/dbmgr/buffered_dbtasks.hpp b/kbe/src/server/dbmgr/buffered_dbtasks.hpp
@@ -72,6 +72,11 @@ class Buffered_DBTasks
 		return ret;
 	}
 
+	/**
+		�ṩ��watcherʹ��
+	*/
+	std::string printBuffered_dbid();
+	std::string printBuffered_entityID();
 protected:
 	bool hasTask_(DBID dbid);
 	bool hasTask_(ENTITY_ID entityID);
diff --git a/kbe/src/server/dbmgr/dbmgr.cpp b/kbe/src/server/dbmgr/dbmgr.cpp
@@ -107,7 +107,9 @@ bool Dbmgr::initializeWatcher()
 
 	WATCH_OBJECT("DBThreadPool/dbid_tasksSize", &bufferedDBTasks_, &Buffered_DBTasks::dbid_tasksSize);
 	WATCH_OBJECT("DBThreadPool/entityid_tasksSize", &bufferedDBTasks_, &Buffered_DBTasks::entityid_tasksSize);
-	
+	WATCH_OBJECT("DBThreadPool/printBuffered_dbid", &bufferedDBTasks_, &Buffered_DBTasks::printBuffered_dbid);
+	WATCH_OBJECT("DBThreadPool/printBuffered_entityID", &bufferedDBTasks_, &Buffered_DBTasks::printBuffered_entityID);
+
 	return ServerApp::initializeWatcher() && DBUtil::pThreadPool()->initializeWatcher();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,9 @@ bool Dbmgr::initializeWatcher()`
`107`	`107`
`108`	`108`	`WATCH_OBJECT("DBThreadPool/dbid_tasksSize", &bufferedDBTasks_, &Buffered_DBTasks::dbid_tasksSize);`
`109`	`109`	`WATCH_OBJECT("DBThreadPool/entityid_tasksSize", &bufferedDBTasks_, &Buffered_DBTasks::entityid_tasksSize);`
`110`		`-`
	`110`	`+ WATCH_OBJECT("DBThreadPool/printBuffered_dbid", &bufferedDBTasks_, &Buffered_DBTasks::printBuffered_dbid);`
	`111`	`+ WATCH_OBJECT("DBThreadPool/printBuffered_entityID", &bufferedDBTasks_, &Buffered_DBTasks::printBuffered_entityID);`
	`112`	`+`
`111`	`113`	`return ServerApp::initializeWatcher() && DBUtil::pThreadPool()->initializeWatcher();`
`112`	`114`	`}`
`113`	`115`