fix: from flat hash map to unordered map

Iterating with "for" range based on phmap::flat_hash_map is very expensive.
opentibiabr · Nov 7, 2024 · d0ef23f · d0ef23f
1 parent 361c4a2
commit d0ef23f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/src/account/account.cpp b/src/account/account.cpp
@@ -249,7 +249,7 @@ void Account::updatePremiumTime() {
 	}
 }
 
-std::tuple<phmap::flat_hash_map<std::string, uint64_t>, AccountErrors_t>
+std::tuple<std::unordered_map<std::string, uint64_t>, AccountErrors_t>
 Account::getAccountPlayers() const {
 	using enum AccountErrors_t;
 	auto valueToReturn = m_accLoaded ? Ok : NotInitialized;

diff --git a/src/account/account.hpp b/src/account/account.hpp
@@ -117,7 +117,7 @@ class Account {
 
 	void updatePremiumTime();
 
-	std::tuple<phmap::flat_hash_map<std::string, uint64_t>, AccountErrors_t> getAccountPlayers() const;
+	std::tuple<std::unordered_map<std::string, uint64_t>, AccountErrors_t> getAccountPlayers() const;
 
 	// Old protocol compat
 	void setProtocolCompat(bool toggle);

diff --git a/src/account/account_info.hpp b/src/account/account_info.hpp
@@ -10,7 +10,6 @@
 #pragma once
 
 #ifndef USE_PRECOMPILED_HEADERS
-	#include <parallel_hashmap/phmap.h>
 	#include <cstdint>
 #endif
 
@@ -23,7 +22,7 @@ struct AccountInfo {
 	uint32_t premiumRemainingDays = 0;
 	time_t premiumLastDay = 0;
 	AccountType accountType = ACCOUNT_TYPE_NONE;
-	phmap::flat_hash_map<std::string, uint64_t> players;
+	std::unordered_map<std::string, uint64_t> players;
 	bool oldProtocol = false;
 	time_t sessionExpires = 0;
 	uint32_t premiumDaysPurchased = 0;

diff --git a/src/creatures/npcs/npc.cpp b/src/creatures/npcs/npc.cpp
@@ -442,7 +442,7 @@ void Npc::onPlayerSellAllLoot(uint32_t playerId, uint16_t itemId, bool ignore, u
 		}
 		bool hasMore = false;
 		uint64_t toSellCount = 0;
-		phmap::flat_hash_map<uint16_t, uint16_t> toSell;
+		std::unordered_map<uint16_t, uint16_t> toSell;
 		for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) {
 			if (toSellCount >= 500) {
 				hasMore = true;

diff --git a/src/game/game.hpp b/src/game/game.hpp
@@ -509,10 +509,10 @@ class Game {
 	const std::map<uint16_t, std::map<uint8_t, uint64_t>> &getItemsPrice() const {
 		return itemsPriceMap;
 	}
-	const phmap::parallel_flat_hash_map<uint32_t, std::shared_ptr<Guild>> &getGuilds() const {
+	const std::unordered_map<uint32_t, std::shared_ptr<Guild>> &getGuilds() const {
 		return guilds;
 	}
-	const phmap::parallel_flat_hash_map<uint32_t, std::shared_ptr<Player>> &getPlayers() const {
+	const std::unordered_map<uint32_t, std::shared_ptr<Player>> &getPlayers() const {
 		return players;
 	}
 	const std::map<uint32_t, std::shared_ptr<Monster>> &getMonsters() const {
@@ -540,7 +540,7 @@ class Game {
 	void addGuild(const std::shared_ptr<Guild> &guild);
 	void removeGuild(uint32_t guildId);
 
-	phmap::flat_hash_map<std::shared_ptr<Tile>, std::weak_ptr<Container>> browseFields;
+	std::unordered_map<std::shared_ptr<Tile>, std::weak_ptr<Container>> browseFields;
 
 	void internalRemoveItems(const std::vector<std::shared_ptr<Item>> &itemVector, uint32_t amount, bool stackable);
 
@@ -814,15 +814,15 @@ class Game {
 	 */
 	ReturnValue collectRewardChestItems(const std::shared_ptr<Player> &player, uint32_t maxMoveItems = 0);
 
-	phmap::flat_hash_map<std::string, QueryHighscoreCacheEntry> queryCache;
-	phmap::flat_hash_map<std::string, HighscoreCacheEntry> highscoreCache;
+	std::unordered_map<std::string, QueryHighscoreCacheEntry> queryCache;
+	std::unordered_map<std::string, HighscoreCacheEntry> highscoreCache;
 
-	phmap::flat_hash_map<std::string, std::weak_ptr<Player>> m_uniqueLoginPlayerNames;
-	phmap::parallel_flat_hash_map<uint32_t, std::shared_ptr<Player>> players;
-	phmap::flat_hash_map<std::string, std::weak_ptr<Player>> mappedPlayerNames;
-	phmap::parallel_flat_hash_map<uint32_t, std::shared_ptr<Guild>> guilds;
-	phmap::flat_hash_map<uint16_t, std::shared_ptr<Item>> uniqueItems;
-	phmap::parallel_flat_hash_map<uint32_t, std::string> m_playerNameCache;
+	std::unordered_map<std::string, std::weak_ptr<Player>> m_uniqueLoginPlayerNames;
+	std::unordered_map<uint32_t, std::shared_ptr<Player>> players;
+	std::unordered_map<std::string, std::weak_ptr<Player>> mappedPlayerNames;
+	std::unordered_map<uint32_t, std::shared_ptr<Guild>> guilds;
+	std::unordered_map<uint16_t, std::shared_ptr<Item>> uniqueItems;
+	std::unordered_map<uint32_t, std::string> m_playerNameCache;
 
 	/* Items stored from the lua scripts positions
 	 * For example: ActionFunctions::luaActionPosition