BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Move profiler measurements into inside of mutex locking for more useful results

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-07 21:54:18 +02:00
parent 0309021359
commit 11716825fc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server.cpp
View File

@ -1108,7 +1108,6 @@ void Server::AsyncRunStep()
} }
{ {
ScopeProfiler sp(g_profiler, "Server: sel and send blocks to clients");
// Send blocks to clients // Send blocks to clients
SendBlocks(dtime); SendBlocks(dtime);
} }
@ -1788,6 +1787,7 @@ void Server::AsyncRunStep()
if(counter >= g_settings->getFloat("server_map_save_interval")) if(counter >= g_settings->getFloat("server_map_save_interval"))
{ {
counter = 0.0; counter = 0.0;
JMutexAutoLock lock(m_env_mutex);
ScopeProfiler sp(g_profiler, "Server: saving stuff"); ScopeProfiler sp(g_profiler, "Server: saving stuff");
@ -1795,13 +1795,10 @@ void Server::AsyncRunStep()
if(m_authmanager.isModified()) if(m_authmanager.isModified())
m_authmanager.save(); m_authmanager.save();
//Bann stuff //Ban stuff
if(m_banmanager.isModified()) if(m_banmanager.isModified())
m_banmanager.save(); m_banmanager.save();
// Map
JMutexAutoLock lock(m_env_mutex);
// Save changed parts of map // Save changed parts of map
m_env->getMap().save(MOD_STATE_WRITE_NEEDED); m_env->getMap().save(MOD_STATE_WRITE_NEEDED);
@ -1862,6 +1859,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
JMutexAutoLock envlock(m_env_mutex); JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex); JMutexAutoLock conlock(m_con_mutex);
ScopeProfiler sp(g_profiler, "Server::ProcessData");
try{ try{
Address address = m_con.GetPeerAddress(peer_id); Address address = m_con.GetPeerAddress(peer_id);
@ -3661,7 +3660,7 @@ void Server::SendBlocks(float dtime)
JMutexAutoLock envlock(m_env_mutex); JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex); JMutexAutoLock conlock(m_con_mutex);
//TimeTaker timer("Server::SendBlocks"); ScopeProfiler sp(g_profiler, "Server: sel and send blocks to clients");
core::array<PrioritySortedBlockTransfer> queue; core::array<PrioritySortedBlockTransfer> queue;