optimize

wangyu- · Nov 5, 2017 · a841cc1 · a841cc1
1 parent ba3bef2
commit a841cc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/common.h b/common.h
@@ -71,7 +71,7 @@ const u32_t conn_timeout_udp=180000;
 const u32_t conn_timeout_tcp=360000;
 const int max_conn_num=20000;
 
-const int conn_clear_ratio=3;
+const int conn_clear_ratio=2;
 const int conn_clear_min=5;
 
 const u32_t conn_clear_interval=1000;

diff --git a/git_version.h b/git_version.h
@@ -1 +1 @@
-const char *gitversion = "25ea4ec0476561a0e4b4f7d34cce28f076688a2e";
+const char *gitversion = "ba3bef2e265bf4d5c61f5829821468a220aa0241";
diff --git a/main.cpp b/main.cpp
@@ -153,9 +153,10 @@ struct conn_manager_t  //TODO change map to unordered map
 		int cnt=0;
 		it=clear_it;
 		int size=fd_last_active_time.size();
-		int num_to_clean=size/conn_clear_ratio+conn_clear_min;   //clear 1/10 each time,to avoid latency glitch
+		int num_to_clean=size/conn_clear_ratio+conn_clear_min;   //clear 2% each time,to avoid latency glitch
 
 		u64_t current_time=get_current_time();
+		num_to_clean=min(num_to_clean,size);
 		for(;;)
 		{
 			if(cnt>=num_to_clean) break;
@@ -221,9 +222,10 @@ struct conn_manager_tcp_t
 		int cnt=0;
 		list<tcp_pair_t>::iterator it=clear_it,old_it;
 		int size=tcp_pair_list.size();
-		int num_to_clean=size/conn_clear_ratio+conn_clear_min;   //clear 1/10 each time,to avoid latency glitch
+		int num_to_clean=size/conn_clear_ratio+conn_clear_min;   //clear 2% each time,to avoid latency glitch
 
 		u64_t current_time=get_current_time();
+		num_to_clean=min(num_to_clean,size);
 		for(;;)
 		{
 			if(cnt>=num_to_clean) break;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		const char *gitversion = "25ea4ec0476561a0e4b4f7d34cce28f076688a2e";
		const char *gitversion = "ba3bef2e265bf4d5c61f5829821468a220aa0241";