From 5d06bdf8ac3b38b1ffb400fd771a245589d92ad1 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 8 Jun 2014 17:25:52 +0200 Subject: [PATCH] Speedup getBlockNodeIdMapping by up to factor 4 by using a fixed size mapping array --- src/mapblock.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/mapblock.cpp b/src/mapblock.cpp index 95e54fb3..8e8961e1 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -452,10 +452,16 @@ s16 MapBlock::getGroundLevel(v2s16 p2d) */ // List relevant id-name pairs for ids in the block using nodedef // Renumbers the content IDs (starting at 0 and incrementing +// use static memory requires about 65535 * sizeof(int) ram in order to be +// sure we can handle all content ids. But it's absolutely worth it as it's +// a speedup of 4 for one of the major time consuming functions on storing +// mapblocks. +static content_t getBlockNodeIdMapping_mapping[USHRT_MAX]; static void getBlockNodeIdMapping(NameIdMapping *nimap, MapNode *nodes, INodeDefManager *nodedef) { - std::map mapping; + memset(getBlockNodeIdMapping_mapping, 0xFF, USHRT_MAX * sizeof(content_t)); + std::set unknown_contents; content_t id_counter = 0; for(u32 i=0; i::iterator j = mapping.find(global_id); - if(j != mapping.end()) - { - id = j->second; + if (getBlockNodeIdMapping_mapping[global_id] != 0xFFFF) { + id = getBlockNodeIdMapping_mapping[global_id]; } else { // We have to assign a new mapping id = id_counter++; - mapping.insert(std::make_pair(global_id, id)); + getBlockNodeIdMapping_mapping[global_id] = id; const ContentFeatures &f = nodedef->get(global_id); const std::string &name = f.name; -- 2.30.2