luanti-org · Jan 10, 2014
diff --git a/‎minetest.conf.example
+4-1 b/‎minetest.conf.example
+4-1
diff --git a/‎src/client.cpp
+6-6 b/‎src/client.cpp
+6-6
diff --git a/‎src/connection.cpp
+2,069-810 b/‎src/connection.cpp
+2,069-810
diff --git a/‎src/connection.h
+600-180 b/‎src/connection.h
+600-180
diff --git a/‎src/defaultsettings.cpp
+2 b/‎src/defaultsettings.cpp
+2
diff --git a/‎src/log.cpp
+2 b/‎src/log.cpp
+2
diff --git a/‎src/server.cpp
+12-10 b/‎src/server.cpp
+12-10
diff --git a/‎src/server.h
+1-1 b/‎src/server.h
+1-1
@@ -345,7 +345,10 @@
 # Number of emerge threads to use.  Make this field blank, or increase this number, to use multiple threads.
 # On multiprocessor systems, this will improve mapgen speed greatly, at the cost of slightly buggy caves.
 #num_emerge_threads = 1
-
+# maximum number of packets sent per send step, if you have a slow connection
+# try reducing it, but don't reduce it to a number below double of targeted
+# client number
+#max_packets_per_iteration = 1024
 #
 # Physics stuff
 #
 
@@ -538,7 +538,7 @@ void Client::step(float dtime)
 			writeU16(&data[53], CLIENT_PROTOCOL_VERSION_MAX);
 
 			// Send as unreliable
-			Send(0, data, false);
+			Send(1, data, false);
 		}
 
 		// Not connected, return
@@ -597,7 +597,7 @@ void Client::step(float dtime)
 					writeV3S16(&reply[2+1+6*k], *j);
 					k++;
 				}
-				m_con.Send(PEER_ID_SERVER, 1, reply, true);
+				m_con.Send(PEER_ID_SERVER, 2, reply, true);
 
 				if(i == deleted_blocks.end())
 					break;
@@ -745,7 +745,7 @@ void Client::step(float dtime)
 				reply[2] = 1;
 				writeV3S16(&reply[3], r.p);
 				// Send as reliable
-				m_con.Send(PEER_ID_SERVER, 1, reply, true);
+				m_con.Send(PEER_ID_SERVER, 2, reply, true);
 			}
 		}
 		if(num_processed_meshes > 0)
@@ -840,7 +840,7 @@ void Client::step(float dtime)
 			std::string s = os.str();
 			SharedBuffer<u8> data((u8*)s.c_str(), s.size());
 			// Send as reliable
-			Send(0, data, true);
+			Send(1, data, true);
 		}
 	}
 }
@@ -957,7 +957,7 @@ void Client::request_media(const std::list<std::string> &file_requests)
 	std::string s = os.str();
 	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
 	// Send as reliable
-	Send(0, data, true);
+	Send(1, data, true);
 	infostream<<"Client: Sending media request list to server ("
 			<<file_requests.size()<<" files)"<<std::endl;
 }
@@ -970,7 +970,7 @@ void Client::received_media()
 	std::string s = os.str();
 	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
 	// Send as reliable
-	Send(0, data, true);
+	Send(1, data, true);
 	infostream<<"Client: Notifying server that we received all media"
 			<<std::endl;
 }
 
@@ -172,6 +172,8 @@ void set_default_settings(Settings *settings)
 
 	// Server stuff
 	// "map-dir" doesn't exist by default.
+	settings->setDefault("workaround_window_size","5");
+	settings->setDefault("max_packets_per_iteration","1024");
 	settings->setDefault("port", "30000");
 	settings->setDefault("default_game", "minetest");
 	settings->setDefault("motd", "");
 
@@ -93,6 +93,7 @@ static std::string get_lev_string(enum LogMessageLevel lev)
 
 void log_printline(enum LogMessageLevel lev, const std::string &text)
 {
+	log_threadnamemutex.Lock();
 	std::string threadname = "(unknown thread)";
 	std::map<threadid_t, std::string>::const_iterator i;
 	i = log_threadnames.find(get_current_thread_id());
@@ -108,6 +109,7 @@ void log_printline(enum LogMessageLevel lev, const std::string &text)
 		out->printLog(os.str(), lev);
 		out->printLog(lev, text);
 	}
+	log_threadnamemutex.Unlock();
 }
 
 class Logbuf : public std::streambuf
 
@@ -90,14 +90,15 @@ class ServerThread : public JThread
 
 void * ServerThread::Thread()
 {
-	ThreadStarted();
-
 	log_register_thread("ServerThread");
 
 	DSTACK(__FUNCTION_NAME);
-
 	BEGIN_DEBUG_EXCEPTION_HANDLER
 
+	m_server->AsyncRunStep(true);
+
+	ThreadStarted();
+
 	while(!StopRequested())
 	{
 		try{
@@ -1018,7 +1019,7 @@ void Server::step(float dtime)
 	}
 }
 
-void Server::AsyncRunStep()
+void Server::AsyncRunStep(bool initial_step)
 {
 	DSTACK(__FUNCTION_NAME);
 
@@ -1035,7 +1036,7 @@ void Server::AsyncRunStep()
 		SendBlocks(dtime);
 	}
 
-	if(dtime < 0.001)
+	if((dtime < 0.001) && (initial_step == false))
 		return;
 
 	g_profiler->add("Server::AsyncRunStep with dtime (num)", 1);
@@ -1528,7 +1529,7 @@ void Server::AsyncRunStep()
 				memcpy((char*)&reply[2], unreliable_data.c_str(),
 						unreliable_data.size());
 				// Send as unreliable
-				m_con.Send(client->peer_id, 0, reply, false);
+				m_con.Send(client->peer_id, 1, reply, false);
 			}
 
 			/*if(reliable_data.size() > 0 || unreliable_data.size() > 0)
@@ -3721,7 +3722,7 @@ void Server::SendHUDAdd(u16 peer_id, u32 id, HudElement *form)
 	std::string s = os.str();
 	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
 	// Send as reliable
-	m_con.Send(peer_id, 0, data, true);
+	m_con.Send(peer_id, 1, data, true);
 }
 
 void Server::SendHUDRemove(u16 peer_id, u32 id)
@@ -3736,7 +3737,8 @@ void Server::SendHUDRemove(u16 peer_id, u32 id)
 	std::string s = os.str();
 	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
 	// Send as reliable
-	m_con.Send(peer_id, 0, data, true);
+
+	m_con.Send(peer_id, 1, data, true);
 }
 
 void Server::SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value)
@@ -4204,7 +4206,7 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto
 	/*
 		Send packet
 	*/
-	m_con.Send(peer_id, 1, reply, true);
+	m_con.Send(peer_id, 2, reply, true);
 }
 
 void Server::SendBlocks(float dtime)
@@ -4566,7 +4568,7 @@ void Server::sendRequestedMedia(u16 peer_id,
 				<<" size=" <<s.size()<<std::endl;
 		SharedBuffer<u8> data((u8*)s.c_str(), s.size());
 		// Send as reliable
-		m_con.Send(peer_id, 0, data, true);
+		m_con.Send(peer_id, 2, data, true);
 	}
 }
 
 
@@ -330,7 +330,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	// Actual processing is done in an another thread.
 	void step(float dtime);
 	// This is run by ServerThread and does the actual processing
-	void AsyncRunStep();
+	void AsyncRunStep(bool initial_step=false);
 	void Receive();
 	void ProcessData(u8 *data, u32 datasize, u16 peer_id);
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,10 @@`
`345`	`345`	`# Number of emerge threads to use. Make this field blank, or increase this number, to use multiple threads.`
`346`	`346`	`# On multiprocessor systems, this will improve mapgen speed greatly, at the cost of slightly buggy caves.`
`347`	`347`	`#num_emerge_threads = 1`
`348`		`-`
	`348`	`+# maximum number of packets sent per send step, if you have a slow connection`
	`349`	`+# try reducing it, but don't reduce it to a number below double of targeted`
	`350`	`+# client number`
	`351`	`+#max_packets_per_iteration = 1024`
`349`	`352`	`#`
`350`	`353`	`# Physics stuff`
`351`	`354`	`#`
Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ void Client::step(float dtime)`
`538`	`538`	`writeU16(&data[53], CLIENT_PROTOCOL_VERSION_MAX);`
`539`	`539`
`540`	`540`	`// Send as unreliable`
`541`		`- Send(0, data, false);`
	`541`	`+ Send(1, data, false);`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`// Not connected, return`
`@@ -597,7 +597,7 @@ void Client::step(float dtime)`
`597`	`597`	`writeV3S16(&reply[2+1+6k], j);`
`598`	`598`	`k++;`
`599`	`599`	`}`
`600`		`- m_con.Send(PEER_ID_SERVER, 1, reply, true);`
	`600`	`+ m_con.Send(PEER_ID_SERVER, 2, reply, true);`
`601`	`601`
`602`	`602`	`if(i == deleted_blocks.end())`
`603`	`603`	`break;`
`@@ -745,7 +745,7 @@ void Client::step(float dtime)`
`745`	`745`	`reply[2] = 1;`
`746`	`746`	`writeV3S16(&reply[3], r.p);`
`747`	`747`	`// Send as reliable`
`748`		`- m_con.Send(PEER_ID_SERVER, 1, reply, true);`
	`748`	`+ m_con.Send(PEER_ID_SERVER, 2, reply, true);`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`	`if(num_processed_meshes > 0)`
`@@ -840,7 +840,7 @@ void Client::step(float dtime)`
`840`	`840`	`std::string s = os.str();`
`841`	`841`	`SharedBuffer<u8> data((u8*)s.c_str(), s.size());`
`842`	`842`	`// Send as reliable`
`843`		`- Send(0, data, true);`
	`843`	`+ Send(1, data, true);`
`844`	`844`	`}`
`845`	`845`	`}`
`846`	`846`	`}`
`@@ -957,7 +957,7 @@ void Client::request_media(const std::list<std::string> &file_requests)`
`957`	`957`	`std::string s = os.str();`
`958`	`958`	`SharedBuffer<u8> data((u8*)s.c_str(), s.size());`
`959`	`959`	`// Send as reliable`
`960`		`- Send(0, data, true);`
	`960`	`+ Send(1, data, true);`
`961`	`961`	`infostream<<"Client: Sending media request list to server ("`
`962`	`962`	`<<file_requests.size()<<" files)"<<std::endl;`
`963`	`963`	`}`
`@@ -970,7 +970,7 @@ void Client::received_media()`
`970`	`970`	`std::string s = os.str();`
`971`	`971`	`SharedBuffer<u8> data((u8*)s.c_str(), s.size());`
`972`	`972`	`// Send as reliable`
`973`		`- Send(0, data, true);`
	`973`	`+ Send(1, data, true);`
`974`	`974`	`infostream<<"Client: Notifying server that we received all media"`
`975`	`975`	`<<std::endl;`
`976`	`976`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ static std::string get_lev_string(enum LogMessageLevel lev)`
`93`	`93`
`94`	`94`	`void log_printline(enum LogMessageLevel lev, const std::string &text)`
`95`	`95`	`{`
	`96`	`+ log_threadnamemutex.Lock();`
`96`	`97`	`std::string threadname = "(unknown thread)";`
`97`	`98`	`std::map<threadid_t, std::string>::const_iterator i;`
`98`	`99`	`i = log_threadnames.find(get_current_thread_id());`
`@@ -108,6 +109,7 @@ void log_printline(enum LogMessageLevel lev, const std::string &text)`
`108`	`109`	`out->printLog(os.str(), lev);`
`109`	`110`	`out->printLog(lev, text);`
`110`	`111`	`}`
	`112`	`+ log_threadnamemutex.Unlock();`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`class Logbuf : public std::streambuf`
Original file line number	Diff line number	Diff line change
`@@ -90,14 +90,15 @@ class ServerThread : public JThread`
`90`	`90`
`91`	`91`	`void * ServerThread::Thread()`
`92`	`92`	`{`
`93`		`- ThreadStarted();`
`94`		`-`
`95`	`93`	`log_register_thread("ServerThread");`
`96`	`94`
`97`	`95`	`DSTACK(__FUNCTION_NAME);`
`98`		`-`
`99`	`96`	`BEGIN_DEBUG_EXCEPTION_HANDLER`
`100`	`97`
	`98`	`+ m_server->AsyncRunStep(true);`
	`99`	`+`
	`100`	`+ ThreadStarted();`
	`101`	`+`
`101`	`102`	`while(!StopRequested())`
`102`	`103`	`{`
`103`	`104`	`try{`
`@@ -1018,7 +1019,7 @@ void Server::step(float dtime)`
`1018`	`1019`	`}`
`1019`	`1020`	`}`
`1020`	`1021`
`1021`		`-void Server::AsyncRunStep()`
	`1022`	`+void Server::AsyncRunStep(bool initial_step)`
`1022`	`1023`	`{`
`1023`	`1024`	`DSTACK(__FUNCTION_NAME);`
`1024`	`1025`
`@@ -1035,7 +1036,7 @@ void Server::AsyncRunStep()`
`1035`	`1036`	`SendBlocks(dtime);`
`1036`	`1037`	`}`
`1037`	`1038`
`1038`		`- if(dtime < 0.001)`
	`1039`	`+ if((dtime < 0.001) && (initial_step == false))`
`1039`	`1040`	`return;`
`1040`	`1041`
`1041`	`1042`	`g_profiler->add("Server::AsyncRunStep with dtime (num)", 1);`
`@@ -1528,7 +1529,7 @@ void Server::AsyncRunStep()`
`1528`	`1529`	`memcpy((char*)&reply[2], unreliable_data.c_str(),`
`1529`	`1530`	`unreliable_data.size());`
`1530`	`1531`	`// Send as unreliable`
`1531`		`- m_con.Send(client->peer_id, 0, reply, false);`
	`1532`	`+ m_con.Send(client->peer_id, 1, reply, false);`
`1532`	`1533`	`}`
`1533`	`1534`
`1534`	`1535`	`/*if(reliable_data.size() > 0 \|\| unreliable_data.size() > 0)`
`@@ -3721,7 +3722,7 @@ void Server::SendHUDAdd(u16 peer_id, u32 id, HudElement *form)`
`3721`	`3722`	`std::string s = os.str();`
`3722`	`3723`	`SharedBuffer<u8> data((u8*)s.c_str(), s.size());`
`3723`	`3724`	`// Send as reliable`
`3724`		`- m_con.Send(peer_id, 0, data, true);`
	`3725`	`+ m_con.Send(peer_id, 1, data, true);`
`3725`	`3726`	`}`
`3726`	`3727`
`3727`	`3728`	`void Server::SendHUDRemove(u16 peer_id, u32 id)`
`@@ -3736,7 +3737,8 @@ void Server::SendHUDRemove(u16 peer_id, u32 id)`
`3736`	`3737`	`std::string s = os.str();`
`3737`	`3738`	`SharedBuffer<u8> data((u8*)s.c_str(), s.size());`
`3738`	`3739`	`// Send as reliable`
`3739`		`- m_con.Send(peer_id, 0, data, true);`
	`3740`	`+`
	`3741`	`+ m_con.Send(peer_id, 1, data, true);`
`3740`	`3742`	`}`
`3741`	`3743`
`3742`	`3744`	`void Server::SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value)`
`@@ -4204,7 +4206,7 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto`
`4204`	`4206`	`/*`
`4205`	`4207`	`Send packet`
`4206`	`4208`	`*/`
`4207`		`- m_con.Send(peer_id, 1, reply, true);`
	`4209`	`+ m_con.Send(peer_id, 2, reply, true);`
`4208`	`4210`	`}`
`4209`	`4211`
`4210`	`4212`	`void Server::SendBlocks(float dtime)`
`@@ -4566,7 +4568,7 @@ void Server::sendRequestedMedia(u16 peer_id,`
`4566`	`4568`	`<<" size=" <<s.size()<<std::endl;`
`4567`	`4569`	`SharedBuffer<u8> data((u8*)s.c_str(), s.size());`
`4568`	`4570`	`// Send as reliable`
`4569`		`- m_con.Send(peer_id, 0, data, true);`
	`4571`	`+ m_con.Send(peer_id, 2, data, true);`
`4570`	`4572`	`}`
`4571`	`4573`	`}`
`4572`	`4574`