perf: change shared_ptrs from copy to reference

.gitignore

@@ -397,3 +397,4 @@ vcpkg_installed
 
 # CLION
 cmake-build-*
+canary-debug

cmake/modules/CheckSIMDSupport.cmake

@@ -0,0 +1,70 @@
+include(CheckCXXCompilerFlag)
+
+if(MSVC)
+    check_cxx_compiler_flag("/arch:AVX2" COMPILER_SUPPORTS_AVX2)
+    if(COMPILER_SUPPORTS_AVX2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
+        add_definitions(-D__AVX2__ -D__SSE4_2__ -D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("AVX2: Advanced Vector Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_AVX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
+        add_definitions(-D__AVX__ -D__SSE4_2__ -D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("AVX: Advanced Vector Extensions supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE42)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE4.2")
+        add_definitions(-D__SSE4_2__ -D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE4.2: Streaming SIMD Extensions 4.2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE41)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE4.1")
+        add_definitions(-D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE4.1: Streaming SIMD Extensions 4.1 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE3)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE3")
+        add_definitions(-D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE3: Streaming SIMD Extensions 3 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+        add_definitions(-D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE2: Streaming SIMD Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE")
+        add_definitions(-D__SSE__)
+        log_option_enabled("SSE: Streaming SIMD Extensions supported and enabled.")
+    else()
+        message(STATUS "No advanced SIMD support found. Proceeding with the default instruction set.")
+    endif()
+else()
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag("-mavx2" COMPILER_SUPPORTS_AVX2)
+    if(COMPILER_SUPPORTS_AVX2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
+        add_definitions(-D__AVX2__)
+        log_option_enabled("AVX2: Advanced Vector Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_AVX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+        add_definitions(-D__AVX__)
+        log_option_enabled("AVX: Advanced Vector Extensions supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE42)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
+        add_definitions(-D__SSE4_2__)
+        log_option_enabled("SSE4.2: Streaming SIMD Extensions 4.2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE41)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
+        add_definitions(-D__SSE4_1__)
+        log_option_enabled("SSE4.1: Streaming SIMD Extensions 4.1 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE3)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse3")
+        add_definitions(-D__SSE3__)
+        log_option_enabled("SSE3: Streaming SIMD Extensions 3 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
+        add_definitions(-D__SSE2__)
+        log_option_enabled("SSE2: Streaming SIMD Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
+        add_definitions(-D__SSE__)
+        log_option_enabled("SSE: Streaming SIMD Extensions supported and enabled.")
+    else()
+        message(STATUS "No advanced SIMD support found. Proceeding with the default instruction set.")
+    endif()
+endif()

data-otservbr-global/scripts/creaturescripts/monster/gaz_haragoth_heal.lua

@@ -5,22 +5,36 @@ condition:setParameter(CONDITION_PARAM_HEALTHGAIN, 0.01)
 condition:setParameter(CONDITION_PARAM_HEALTHTICKS, 7 * 1000)
 
 local gazHaragothHeal = CreatureEvent("GazHaragothHeal")
-function gazHaragothHeal.onThink(creature)
-	local hp = (creature:getHealth() / creature:getMaxHealth()) * 100
-	if hp < 12.5 and not creature:getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT, 88888) then
-		creature:addCondition(condition)
-		creature:say("Gaz'haragoth begins to draw on the nightmares to HEAL himself!", TALKTYPE_MONSTER_YELL)
-		addEvent(function(cid)
-			local creature = Creature(cid)
-			if not creature then
-				return
+function gazHaragothHeal.onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin)
+	if not creature then
+		return true
+	end
+	local creatureName = creature:getName():lower() == "gaz'haragoth"
+	if creatureName then
+		if attacker then
+			local hp = (creature:getHealth() / creature:getMaxHealth()) * 100
+			if hp > 12.5 then
+				return primaryDamage, primaryType, secondaryDamage, secondaryType
+			end
+			if hp <= 12.5 and not creature:getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT, 88888) then
+				if not creature then
+					return true
+				end
+				creature:addCondition(condition)
+				creature:say("Gaz'haragoth begins to draw on the nightmares to HEAL himself!", TALKTYPE_MONSTER_YELL)
+				addEvent(function()
+					if not creature then
+						return true
+					end
+					creature:addHealth(300000)
+					creature:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+					creature:say("Gaz'haragoth HEALS himself!", TALKTYPE_MONSTER_YELL)
+					return true
+				end, 7000, creature:getId())
 			end
-			creature:addHealth(300000)
-			creature:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
-			creature:say("Gaz'haragoth HEALS himself!", TALKTYPE_MONSTER_YELL)
-			return true
-		end, 7000, creature:getId())
+		end
 	end
+	return primaryDamage, primaryType, secondaryDamage, secondaryType
 end
 
 gazHaragothHeal:register()

src/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 
 # Base configurations and settings for the project
 include(BaseConfig)
+include(CheckSIMDSupport)
 include(GNUInstallDirs)
 
 # Import configurations, source definitions, and linker settings

src/account/account.cpp

@@ -225,10 +225,10 @@ void Account::updatePremiumTime() {
 	time_t lastDay = m_account->premiumLastDay;
 	uint32_t remainingDays = m_account->premiumRemainingDays;
 
-	time_t currentTime = getTimeNow();
+	const time_t currentTime = getTimeNow();
 
-	auto daysLeft = static_cast<int32_t>((lastDay - currentTime) / 86400);
-	auto timeLeft = static_cast<int32_t>((lastDay - currentTime) % 86400);
+	const auto daysLeft = static_cast<int32_t>((lastDay - currentTime) / 86400);
+	const auto timeLeft = static_cast<int32_t>((lastDay - currentTime) % 86400);
 
 	m_account->premiumRemainingDays = daysLeft > 0 ? daysLeft : 0;
 
@@ -281,7 +281,7 @@ bool Account::authenticateSession() {
 }
 
 bool Account::authenticatePassword(const std::string &password) {
-	if (Argon2 {}.argon(password.c_str(), getPassword())) {
+	if (Argon2().argon(password, getPassword())) {
 		return true;
 	}
 

src/account/account_repository.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "account/account_repository.hpp"
-
 #include "lib/di/container.hpp"
 
 AccountRepository &AccountRepository::getInstance() {

src/account/account_repository_db.cpp

@@ -25,13 +25,13 @@ AccountRepositoryDB::AccountRepositoryDB() {
 bool AccountRepositoryDB::loadByID(const uint32_t &id, std::unique_ptr<AccountInfo> &acc) {
 	auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `id` = {}", id);
 	return load(query, acc);
-};
+}
 
 bool AccountRepositoryDB::loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, std::unique_ptr<AccountInfo> &acc) {
 	auto identifier = oldProtocol ? "name" : "email";
-	auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `{}` = {}", identifier, g_database().escapeString(emailOrName));
+	const auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `{}` = {}", identifier, g_database().escapeString(emailOrName));
 	return load(query, acc);
-};
+}
 
 bool AccountRepositoryDB::loadBySession(const std::string &sessionKey, std::unique_ptr<AccountInfo> &acc) {
 	auto query = fmt::format(
@@ -42,7 +42,7 @@ bool AccountRepositoryDB::loadBySession(const std::string &sessionKey, std::uniq
 		g_database().escapeString(transformToSHA1(sessionKey))
 	);
 	return load(query, acc);
-};
+}
 
 bool AccountRepositoryDB::save(const std::unique_ptr<AccountInfo> &accInfo) {
 	bool successful = g_database().executeQuery(
@@ -62,7 +62,7 @@ bool AccountRepositoryDB::save(const std::unique_ptr<AccountInfo> &accInfo) {
 	}
 
 	return successful;
-};
+}
 
 bool AccountRepositoryDB::getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) {
 	auto result = g_database().storeQuery(fmt::format("SELECT `id` FROM `players` WHERE `account_id` = {} AND `name` = {}", id, g_database().escapeString(name)));
@@ -75,15 +75,15 @@ bool AccountRepositoryDB::getCharacterByAccountIdAndName(const uint32_t &id, con
 }
 
 bool AccountRepositoryDB::getPassword(const uint32_t &id, std::string &password) {
-	auto result = g_database().storeQuery(fmt::format("SELECT * FROM `accounts` WHERE `id` = {}", id));
+	const auto result = g_database().storeQuery(fmt::format("SELECT * FROM `accounts` WHERE `id` = {}", id));
 	if (!result) {
 		g_logger().error("Failed to get account:[{}] password!", id);
 		return false;
 	}
 
 	password = result->getString("password");
 	return true;
-};
+}
 
 bool AccountRepositoryDB::getCoins(const uint32_t &id, CoinType coinType, uint32_t &coins) {
 	auto it = coinTypeToColumn.find(coinType);
@@ -107,7 +107,7 @@ bool AccountRepositoryDB::getCoins(const uint32_t &id, CoinType coinType, uint32
 	coins = result->getNumber<uint32_t>(column);
 
 	return true;
-};
+}
 
 bool AccountRepositoryDB::setCoins(const uint32_t &id, CoinType coinType, const uint32_t &amount) {
 	auto it = coinTypeToColumn.find(coinType);
@@ -130,7 +130,7 @@ bool AccountRepositoryDB::setCoins(const uint32_t &id, CoinType coinType, const
 	}
 
 	return successful;
-};
+}
 
 bool AccountRepositoryDB::registerCoinsTransaction(
 	const uint32_t &id,
@@ -139,7 +139,7 @@ bool AccountRepositoryDB::registerCoinsTransaction(
 	CoinType coinType,
 	const std::string &description
 ) {
-	bool successful = g_database().executeQuery(
+	const bool successful = g_database().executeQuery(
 		fmt::format(
 			"INSERT INTO `coins_transactions` (`account_id`, `type`, `coin_type`, `amount`, `description`) VALUES ({}, {}, {}, {}, {})",
 			id,
@@ -162,7 +162,7 @@ bool AccountRepositoryDB::registerCoinsTransaction(
 	}
 
 	return successful;
-};
+}
 
 bool AccountRepositoryDB::loadAccountPlayers(std::unique_ptr<AccountInfo> &acc) const {
 	auto result = g_database().storeQuery(

src/canary_server.cpp

@@ -143,7 +143,7 @@ int CanaryServer::run() {
 	return EXIT_SUCCESS;
 }
 
-void CanaryServer::setWorldType() {
+void CanaryServer::setWorldType() const {
 	const std::string worldType = asLowerCaseString(g_configManager().getString(WORLD_TYPE));
 	if (worldType == "pvp") {
 		g_game().setWorldType(WORLD_TYPE_PVP);
@@ -177,9 +177,9 @@ void CanaryServer::loadMaps() const {
 	}
 }
 
-void CanaryServer::setupHousesRent() {
+void CanaryServer::setupHousesRent() const {
 	RentPeriod_t rentPeriod;
-	std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD));
+	const std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD));
 
 	if (strRentPeriod == "yearly") {
 		rentPeriod = RENTPERIOD_YEARLY;
@@ -196,7 +196,7 @@ void CanaryServer::setupHousesRent() {
 	g_game().map.houses.payHouses(rentPeriod);
 }
 
-void CanaryServer::logInfos() {
+void CanaryServer::logInfos() const {
 #if defined(GIT_RETRIEVED_STATE) && GIT_RETRIEVED_STATE
 	logger.debug("{} - Version [{}] dated [{}]", ProtocolStatus::SERVER_NAME, SERVER_RELEASE_VERSION, GIT_COMMIT_DATE_ISO8601);
 	#if GIT_IS_DIRTY
@@ -270,7 +270,7 @@ std::string CanaryServer::getCompiler() {
 #endif
 }
 
-void CanaryServer::loadConfigLua() {
+void CanaryServer::loadConfigLua() const {
 	std::string configName = "config.lua";
 	// Check if config or config.dist exist
 	std::ifstream c_test("./" + configName);
@@ -301,7 +301,7 @@ void CanaryServer::loadConfigLua() {
 #endif
 }
 
-void CanaryServer::initializeDatabase() {
+void CanaryServer::initializeDatabase() const {
 	logger.info("Establishing database connection... ");
 	if (!Database::getInstance().connect()) {
 		throw FailedToInitializeCanary("Failed to connect to database!");
@@ -325,7 +325,7 @@ void CanaryServer::initializeDatabase() {
 	g_logger().info("Database connection established!");
 }
 
-void CanaryServer::loadModules() {
+void CanaryServer::loadModules() const {
 	// If "USE_ANY_DATAPACK_FOLDER" is set to true then you can choose any datapack folder for your server
 	const auto useAnyDatapack = g_configManager().getBoolean(USE_ANY_DATAPACK_FOLDER);
 	auto datapackName = g_configManager().getString(DATA_DIRECTORY);
@@ -382,7 +382,7 @@ void CanaryServer::loadModules() {
 	g_game().logCyclopediaStats();
 }
 
-void CanaryServer::modulesLoadHelper(bool loaded, std::string moduleName) {
+void CanaryServer::modulesLoadHelper(bool loaded, std::string moduleName) const {
 	logger.debug("Loading {}", moduleName);
 	if (!loaded) {
 		throw FailedToInitializeCanary(fmt::format("Cannot load: {}", moduleName));

src/canary_server.hpp

@@ -14,7 +14,7 @@
 
 class Logger;
 
-class FailedToInitializeCanary : public std::exception {
+class FailedToInitializeCanary final : public std::exception {
 private:
 	std::string message;
 
@@ -52,19 +52,19 @@ class CanaryServer {
 
 	std::atomic<LoaderStatus> loaderStatus = LoaderStatus::LOADING;
 
-	void logInfos();
+	void logInfos() const;
 	static void toggleForceCloseButton();
 	static void badAllocationHandler();
 	static void shutdown();
 
 	static std::string getCompiler();
 	static std::string getPlatform();
 
-	void loadConfigLua();
-	void initializeDatabase();
-	void loadModules();
-	void setWorldType();
+	void loadConfigLua() const;
+	void initializeDatabase() const;
+	void loadModules() const;
+	void setWorldType() const;
 	void loadMaps() const;
-	void setupHousesRent();
-	void modulesLoadHelper(bool loaded, std::string moduleName);
+	void setupHousesRent() const;
+	void modulesLoadHelper(bool loaded, std::string moduleName) const;
 };

src/config/configmanager.cpp

@@ -376,7 +376,7 @@ bool ConfigManager::reload() {
 	return result;
 }
 
-void ConfigManager::missingConfigWarning(const char* identifier) {
+void ConfigManager::missingConfigWarning(const char* identifier) const {
 	g_logger().debug("[{}]: Missing configuration for identifier: {}", __FUNCTION__, identifier);
 }
 

src/config/configmanager.hpp

@@ -26,7 +26,7 @@ class ConfigManager {
 	bool load();
 	bool reload();
 
-	void missingConfigWarning(const char* identifier);
+	void missingConfigWarning(const char* identifier) const;
 
 	const std::string &setConfigFileLua(const std::string &what) {
 		configFileLua = { what };