Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 9c9324f5f578ccbfc2899ecf204b7c7594413dd0..7bc1334b0fbf9aa2238e7abfe29e2006e5c74628 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -139,6 +139,21 @@ MapBlock * Map::getBlockNoCreate(v3s16 p3d)
        return block;
 }
 
+void Map::listAllLoadedBlocks(std::vector<v3s16> &dst)
+{
+       for (auto &sector_it : m_sectors) {
+               MapSector *sector = sector_it.second;
+
+               MapBlockVect blocks;
+               sector->getBlocks(blocks);
+
+               for (MapBlock *block : blocks) {
+                       v3s16 p = block->getPos();
+                       dst.push_back(p);
+               }
+       }
+}
+
 bool Map::isValidPosition(v3s16 p)
 {
        v3s16 blockpos = getNodeBlockPos(p);
@@ -336,6 +351,7 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
        u32 saved_blocks_count = 0;
        u32 block_count_all = 0;
 
+       const auto start_time = porting::getTimeUs();
        beginSave();
 
        // If there is no practical limit, we spare creation of mapblock_queue
@@ -377,6 +393,7 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
                                }
                        }
 
+                       // Delete sector if we emptied it
                        if (all_blocks_deleted) {
                                sector_deletion_queue.push_back(sector_it.first);
                        }
@@ -395,6 +412,7 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
                        }
                }
                block_count_all = mapblock_queue.size();
+
                // Delete old blocks, and blocks over the limit from the memory
                while (!mapblock_queue.empty() && (mapblock_queue.size() > max_loaded_blocks
                                || mapblock_queue.top().block->getUsageTimer() > unload_timeout)) {
@@ -425,6 +443,7 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
                        deleted_blocks_count++;
                        block_count_all--;
                }
+
                // Delete empty sectors
                for (auto &sector_it : m_sectors) {
                        if (sector_it.second->empty()) {
@@ -432,7 +451,11 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
                        }
                }
        }
+
        endSave();
+       const auto end_time = porting::getTimeUs();
+
+       reportMetrics(end_time - start_time, saved_blocks_count, block_count_all);
 
        // Finally delete the empty sectors
        deleteSectors(sector_deletion_queue);
@@ -1218,7 +1241,12 @@ ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
        m_savedir = savedir;
        m_map_saving_enabled = false;
 
-       m_save_time_counter = mb->addCounter("minetest_core_map_save_time", "Map save time (in nanoseconds)");
+       m_save_time_counter = mb->addCounter(
+               "minetest_map_save_time", "Time spent saving blocks (in microseconds)");
+       m_save_count_counter = mb->addCounter(
+               "minetest_map_saved_blocks", "Number of blocks saved");
+       m_loaded_blocks_gauge = mb->addGauge(
+               "minetest_map_loaded_blocks", "Number of loaded blocks");
 
        m_map_compression_level = rangelim(g_settings->getS16("map_compression_level_disk"), -1, 9);
 
@@ -1594,6 +1622,13 @@ void ServerMap::updateVManip(v3s16 pos)
        vm->m_is_dirty = true;
 }
 
+void ServerMap::reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks)
+{
+       m_loaded_blocks_gauge->set(all_blocks);
+       m_save_time_counter->increment(save_time_us);
+       m_save_count_counter->increment(saved_blocks);
+}
+
 void ServerMap::save(ModifiedState save_level)
 {
        if (!m_map_saving_enabled) {
@@ -1601,7 +1636,7 @@ void ServerMap::save(ModifiedState save_level)
                return;
        }
 
-       u64 start_time = porting::getTimeNs();
+       const auto start_time = porting::getTimeUs();
 
        if(save_level == MOD_STATE_CLEAN)
                infostream<<"ServerMap: Saving whole map, this can take time."
@@ -1662,8 +1697,8 @@ void ServerMap::save(ModifiedState save_level)
                modprofiler.print(infostream);
        }
 
-       auto end_time = porting::getTimeNs();
-       m_save_time_counter->increment(end_time - start_time);
+       const auto end_time = porting::getTimeUs();
+       reportMetrics(end_time - start_time, block_count, block_count_all);
 }
 
 void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
@@ -1673,21 +1708,6 @@ void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
                dbase_ro->listAllLoadableBlocks(dst);
 }
 
-void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
-{
-       for (auto &sector_it : m_sectors) {
-               MapSector *sector = sector_it.second;
-
-               MapBlockVect blocks;
-               sector->getBlocks(blocks);
-
-               for (MapBlock *block : blocks) {
-                       v3s16 p = block->getPos();
-                       dst.push_back(p);
-               }
-       }
-}
-
 MapDatabase *ServerMap::createDatabase(
        const std::string &name,
        const std::string &savedir,
@@ -1896,6 +1916,7 @@ MMVManip::MMVManip(Map *map):
                VoxelManipulator(),
                m_map(map)
 {
+       assert(map);
 }
 
 void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
@@ -1903,6 +1924,8 @@ void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
 {
        TimeTaker timer1("initialEmerge", &emerge_time);
 
+       assert(m_map);
+
        // Units of these are MapBlocks
        v3s16 p_min = blockpos_min;
        v3s16 p_max = blockpos_max;
@@ -1986,6 +2009,7 @@ void MMVManip::blitBackAll(std::map<v3s16, MapBlock*> *modified_blocks,
 {
        if(m_area.getExtent() == v3s16(0,0,0))
                return;
+       assert(m_map);
 
        /*
                Copy data of all blocks
@@ -2006,4 +2030,33 @@ void MMVManip::blitBackAll(std::map<v3s16, MapBlock*> *modified_blocks,
        }
 }
 
+MMVManip *MMVManip::clone() const
+{
+       MMVManip *ret = new MMVManip();
+
+       const s32 size = m_area.getVolume();
+       ret->m_area = m_area;
+       if (m_data) {
+               ret->m_data = new MapNode[size];
+               memcpy(ret->m_data, m_data, size * sizeof(MapNode));
+       }
+       if (m_flags) {
+               ret->m_flags = new u8[size];
+               memcpy(ret->m_flags, m_flags, size * sizeof(u8));
+       }
+
+       ret->m_is_dirty = m_is_dirty;
+       // Even if the copy is disconnected from a map object keep the information
+       // needed to write it back to one
+       ret->m_loaded_blocks = m_loaded_blocks;
+
+       return ret;
+}
+
+void MMVManip::reparent(Map *map)
+{
+       assert(map && !m_map);
+       m_map = map;
+}
+
 //END