mirror of
https://github.com/DarkflameUniverse/DarkflameServer
synced 2024-08-30 18:43:58 +00:00
cleanup
This commit is contained in:
parent
45256a0338
commit
85aa82b4b9
@ -1646,7 +1646,6 @@ void GameMessages::SendActivitySummaryLeaderboardData(const LWOOBJID& objectID,
|
|||||||
bitStream.Write(eGameMessageType::SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA);
|
bitStream.Write(eGameMessageType::SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA);
|
||||||
|
|
||||||
leaderboard->Serialize(&bitStream);
|
leaderboard->Serialize(&bitStream);
|
||||||
PacketUtils::SavePacket("leaderboardData.bin", (const char*)bitStream.GetData(), bitStream.GetNumberOfBytesUsed());
|
|
||||||
SEND_PACKET;
|
SEND_PACKET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
set(DGAMETEST_SOURCES
|
set(DGAMETEST_SOURCES
|
||||||
"GameDependencies.cpp"
|
"GameDependencies.cpp"
|
||||||
"LeaderboardTests.cpp"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_subdirectory(dComponentsTests)
|
add_subdirectory(dComponentsTests)
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
#include "dServer.h"
|
#include "dServer.h"
|
||||||
#include "EntityInfo.h"
|
#include "EntityInfo.h"
|
||||||
#include "EntityManager.h"
|
#include "EntityManager.h"
|
||||||
#include "Database.h"
|
|
||||||
#include "dConfig.h"
|
#include "dConfig.h"
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
@ -33,7 +32,6 @@ protected:
|
|||||||
Game::logger = new dLogger("./testing.log", true, true);
|
Game::logger = new dLogger("./testing.log", true, true);
|
||||||
Game::server = new dServerMock();
|
Game::server = new dServerMock();
|
||||||
Game::config = new dConfig("worldconfig.ini");
|
Game::config = new dConfig("worldconfig.ini");
|
||||||
// Database::Connect(Game::config->GetValue("mysql_host"), Game::config->GetValue("mysql_database"), Game::config->GetValue("mysql_username"), Game::config->GetValue("mysql_password"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TearDownDependencies() {
|
void TearDownDependencies() {
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
#include "LeaderboardManager.h"
|
|
||||||
|
|
||||||
#include "BitStream.h"
|
|
||||||
#include "GameDependencies.h"
|
|
||||||
#include "Metrics.hpp"
|
|
||||||
#include <gtest/gtest.h>
|
|
||||||
|
|
||||||
class LeaderboardTests : public GameDependenciesTest {
|
|
||||||
protected:
|
|
||||||
void SetUp() override {
|
|
||||||
SetUpDependencies();
|
|
||||||
}
|
|
||||||
void TearDown() override {
|
|
||||||
TearDownDependencies();
|
|
||||||
}
|
|
||||||
|
|
||||||
void TestLeaderboard(Leaderboard& leaderboard, int32_t entries) {
|
|
||||||
bitStream.Reset();
|
|
||||||
Metrics::StartMeasurement(MetricVariable::Leaderboard);
|
|
||||||
for (int32_t i = 0; i < MAX_MEASURMENT_POINTS; i++) leaderboard.Serialize(&bitStream);
|
|
||||||
Metrics::EndMeasurement(MetricVariable::Leaderboard);
|
|
||||||
|
|
||||||
auto timePassed = Metrics::GetMetric(MetricVariable::Leaderboard)->average;
|
|
||||||
Game::logger->Log("LeaderboardManager", "average time passed for %i leaderboard entries is %lluns", entries, timePassed);
|
|
||||||
bitStream.Reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
void RunTests(uint32_t gameID, Leaderboard::Type type, Leaderboard::InfoType infoType) {
|
|
||||||
Game::logger->Log("LeaderboardTests", "Testing leaderboard %i for Serialize speed", infoType);
|
|
||||||
Leaderboard leaderboard(gameID, infoType, false, 14231, type);
|
|
||||||
leaderboard.SetupLeaderboard(true, 0, 10);
|
|
||||||
leaderboard.Serialize(&bitStream);
|
|
||||||
TestLeaderboard(leaderboard, 1);
|
|
||||||
TestLeaderboard(leaderboard, 10);
|
|
||||||
TestLeaderboard(leaderboard, 100);
|
|
||||||
TestLeaderboard(leaderboard, 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
CBITSTREAM;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initial metrics
|
|
||||||
* 19: [12-04-23 23:56:31] [LeaderboardManager] average time passed for 1 leaderboard entries is 1671700ns
|
|
||||||
* 19: [12-04-23 23:56:31] [LeaderboardManager] average time passed for 10 leaderboard entries is 8388900ns
|
|
||||||
* 19: [12-04-23 23:56:31] [LeaderboardManager] average time passed for 100 leaderboard entries is 54680133ns
|
|
||||||
* 19: [12-04-23 23:56:33] [LeaderboardManager] average time passed for 1000 leaderboard entries is 506289325ns
|
|
||||||
|
|
||||||
* Only do each std::to_string once
|
|
||||||
* 19: [12-04-23 23:57:31] [LeaderboardManager] average time passed for 1 leaderboard entries is 1472700ns
|
|
||||||
* 19: [12-04-23 23:57:31] [LeaderboardManager] average time passed for 10 leaderboard entries is 7035650ns
|
|
||||||
* 19: [12-04-23 23:57:31] [LeaderboardManager] average time passed for 100 leaderboard entries is 45147466ns
|
|
||||||
* 19: [12-04-23 23:57:33] [LeaderboardManager] average time passed for 1000 leaderboard entries is 435724550ns
|
|
||||||
*
|
|
||||||
* Only do Result[0].Row[index] once
|
|
||||||
* 19: [12-04-23 23:59:43] [LeaderboardManager] average time passed for 1 leaderboard entries is 1357700ns
|
|
||||||
* 19: [12-04-23 23:59:43] [LeaderboardManager] average time passed for 10 leaderboard entries is 6635350ns
|
|
||||||
* 19: [12-04-23 23:59:43] [LeaderboardManager] average time passed for 100 leaderboard entries is 40247800ns
|
|
||||||
* 19: [12-04-23 23:59:45] [LeaderboardManager] average time passed for 1000 leaderboard entries is 400965900ns
|
|
||||||
*
|
|
||||||
* Switch to ostringstream
|
|
||||||
* 19: [13-04-23 00:24:44] [LeaderboardManager] average time passed for 1 leaderboard entries is 1334300ns
|
|
||||||
* 19: [13-04-23 00:24:44] [LeaderboardManager] average time passed for 10 leaderboard entries is 5566250ns
|
|
||||||
* 19: [13-04-23 00:24:44] [LeaderboardManager] average time passed for 100 leaderboard entries is 34640066ns
|
|
||||||
* 19: [13-04-23 00:24:46] [LeaderboardManager] average time passed for 1000 leaderboard entries is 357226950ns
|
|
||||||
*
|
|
||||||
* No more std::to_string and revert "Only do Result[0].Row[index] once"
|
|
||||||
* 19: [13-04-23 00:39:18] [LeaderboardManager] average time passed for 1 leaderboard entries is 979200ns
|
|
||||||
* 19: [13-04-23 00:39:18] [LeaderboardManager] average time passed for 10 leaderboard entries is 4053350ns
|
|
||||||
* 19: [13-04-23 00:39:18] [LeaderboardManager] average time passed for 100 leaderboard entries is 24785233ns
|
|
||||||
* 19: [13-04-23 00:39:19] [LeaderboardManager] average time passed for 1000 leaderboard entries is 279457375ns
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Commented tests out because we dont have a sql server running for tests
|
|
||||||
// TEST_F(LeaderboardTests, LeaderboardSpeedTest) {
|
|
||||||
// RunTests(1864, Leaderboard::Type::ShootingGallery , Leaderboard::InfoType::Top);
|
|
||||||
// RunTests(1864, Leaderboard::Type::ShootingGallery, Leaderboard::InfoType::MyStanding);
|
|
||||||
// RunTests(1864, Leaderboard::Type::ShootingGallery, Leaderboard::InfoType::Friends);
|
|
||||||
// }
|
|
Loading…
Reference in New Issue
Block a user