Warning fixes, general cleanup (#5053)

world/cli/cli_database_concurrency.cpp

@@ -20,9 +20,12 @@
 #include "common/eqemu_config.h"
 #include "common/repositories/zone_repository.h"
 
+#include <chrono>
 #include <csignal>
 #include <thread>
 
+using namespace std::chrono_literals;
+
 Database db;
 Database db2;
 
@@ -60,8 +63,6 @@ void WorldserverCLI::TestDatabaseConcurrency(int argc, char **argv, argh::parser
 
 	LogInfo("Database test");
 
-	auto mutex = new Mutex;
-
 	auto c = EQEmuConfig::get();
 	LogInfo("Connecting to MySQL");
 	if (!db.Connect(
@@ -75,19 +76,19 @@ void WorldserverCLI::TestDatabaseConcurrency(int argc, char **argv, argh::parser
 		return;
 	}
 
-	db.SetMutex(mutex);
+	std::shared_ptr<DBcore::Mutex> sharedMutex = std::make_shared<DBcore::Mutex>();
+
+	db.SetMutex(sharedMutex);
 
 	db2.SetMySQL(db);
 
-	db2.SetMutex(mutex);
+	db2.SetMutex(sharedMutex);
 
 	std::thread(DatabaseTest).detach();
 	std::thread(DatabaseTest).detach();
 	std::thread(DatabaseTestSecondConnection).detach();
 
 	while (!stop) {
-
+		std::this_thread::sleep_for(0s);
 	}
-
-	safe_delete(mutex);
 }

world/cli/cli_database_version.cpp

@@ -37,8 +37,5 @@ void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, s
 	v["bots_database_version"]   = RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0;
 	v["custom_database_version"] = CUSTOM_BINARY_DATABASE_VERSION;
 
-	std::stringstream payload;
-	payload << v;
-
-	std::cout << payload.str() << std::endl;
+	std::cout << v << std::endl;
 }

world/cli/cli_test.cpp

@@ -18,7 +18,7 @@
 #include "world/world_server_cli.h"
 
 #include "common/events/player_events.h"
-#include "common/memory/ksm.hpp"
+#include "common/memory/ksm.h"
 
 #include "cereal/archives/json.hpp"
 #include "cereal/types/vector.hpp"

world/cli/cli_version.cpp

@@ -39,8 +39,5 @@ void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::stri
 	j["database_version"]        = CURRENT_BINARY_DATABASE_VERSION;
 	j["server_version"]          = CURRENT_VERSION;
 
-	std::stringstream payload;
-	payload << j;
-
-	std::cout << payload.str() << std::endl;
+	std::cout << j << std::endl;
 }