From 8f25f487fe6a726fdbf65a63c4157738ec748466 Mon Sep 17 00:00:00 2001
From: lhofhansl <larsh@apache.org>
Date: Mon, 19 Jun 2023 16:59:08 -0700
Subject: [PATCH] Instrument touchMapBlocks and block loading/deserialization.
 (#13314)

---
 src/client/clientmap.cpp | 2 ++
 src/map.cpp              | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
index 00fd4b133..3115b47ae 100644
--- a/src/client/clientmap.cpp
+++ b/src/client/clientmap.cpp
@@ -623,6 +623,8 @@ void ClientMap::touchMapBlocks()
 	if (m_control.range_all || m_loops_occlusion_culler)
 		return;
 
+	ScopeProfiler sp(g_profiler, "CM::touchMapBlocks()", SPT_AVG);
+
 	v3s16 cam_pos_nodes = floatToInt(m_camera_position, BS);
 
 	v3s16 p_blocks_min;
diff --git a/src/map.cpp b/src/map.cpp
index e223ba049..3ed740395 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1803,8 +1803,11 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
 			block = block_created_new.get();
 		}
 
+		{
+		ScopeProfiler sp(g_profiler, "ServerMap: deSer block", SPT_AVG);
 		// Read basic data
 		block->deSerialize(is, version, true);
+		}
 
 		// If it's a new block, insert it to the map
 		if (block_created_new) {
@@ -1845,6 +1848,7 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
 
 MapBlock* ServerMap::loadBlock(v3s16 blockpos)
 {
+	ScopeProfiler sp(g_profiler, "ServerMap: load block", SPT_AVG);
 	bool created_new = (getBlockNoCreateNoEx(blockpos) == NULL);
 
 	v2s16 p2d(blockpos.X, blockpos.Z);