birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imgui per entity works

Browse Source 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
This commit is contained in:
AMZN-Olex
2021-07-26 21:59:19 -04:00
parent f29fd86a39
commit a2f3066fa3
13 changed files with 155 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugPerEntityReporter.cpp
+79 -258
View File
@@ -7,23 +7,22 @@
*/
#include "MultiplayerDebugPerEntityReporter.h"
#include <GridMate/Replica/ReplicaChunk.h>
#include <GridMate/Replica/ReplicaChunkDescriptor.h>
#include <GridMate/Replica/RemoteProcedureCall.h>
#include <Multiplayer/IMultiplayer.h>
#if defined(IMGUI_ENABLED)
#include <imgui/imgui.h>
#endif
#pragma optimize("", off)
namespace MultiplayerDiagnostics
{
#if defined(IMGUI_ENABLED)
static const ImVec4 k_ImGuiTomato = ImVec4(1.0f, 0.4f, 0.3f, 1.0f);
static const ImVec4 k_ImGuiKhaki = ImVec4(0.9f, 0.8f, 0.5f, 1.0f);
static const ImVec4 k_ImGuiCyan = ImVec4(0.5f, 1.0f, 1.0f, 1.0f);
static const ImVec4 k_ImGuiDusk = ImVec4(0.7f, 0.7f, 1.0f, 1.0f);
static const ImVec4 k_ImGuiWhite = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
static const ImVec4 k_ImGuiKhaki = ImVec4(0.9f, 0.8f, 0.5f, 1.0f);
static const ImVec4 k_ImGuiCyan = ImVec4(0.5f, 1.0f, 1.0f, 1.0f);
static const ImVec4 k_ImGuiDusk = ImVec4(0.7f, 0.7f, 1.0f, 1.0f);
static const ImVec4 k_ImGuiWhite = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
// --------------------------------------------------------------------------------------------
template <typename Reporter>
@@ -111,291 +110,103 @@ namespace MultiplayerDiagnostics
}
#endif
MultiplayerDebugPerEntityReporter::MultiplayerDebugPerEntityReporter ()
{
//GridMate::Debug::CarrierDrillerBus::Handler::BusConnect();
}
// --------------------------------------------------------------------------------------------
MultiplayerDebugPerEntityReporter::~MultiplayerDebugPerEntityReporter()
{
/*GridMate::Debug::ReplicaDrillerBus::Handler::BusDisconnect();
GridMate::Debug::CarrierDrillerBus::Handler::BusDisconnect();*/
}
//void MultiplayerDebugPerEntityReporter::OnReceiveReplicaBegin(GridMate::Replica*, const void*, size_t)
//{
// m_currentReceivingEntityReport.Reset();
//}
//void MultiplayerDebugPerEntityReporter::OnReceiveReplicaEnd(GridMate::Replica* replica)
//{
// m_receivingEntityReports[replica->GetDebugName()].Combine(m_currentReceivingEntityReport);
//}
//void MultiplayerDebugPerEntityReporter::OnReceiveReplicaChunkEnd(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex)
//{
// AZ_UNUSED(chunk);
// AZ_UNUSED(chunkIndex);
// m_currentReceivingEntityReport.ReportFragmentEnd();
//}
//void MultiplayerDebugPerEntityReporter::OnReceiveDataSet(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex,
// GridMate::DataSetBase* dataSet, GridMate::PeerId, GridMate::PeerId, const void*, size_t len)
//{
// m_currentReceivingEntityReport.ReportField(chunkIndex, chunk->GetDescriptor()->GetChunkName(), chunk->GetDescriptor()->GetDataSetName(chunk, dataSet), len);
//}
//void MultiplayerDebugPerEntityReporter::OnReceiveRpc (GridMate::ReplicaChunkBase* chunk,
// AZ::u32 chunkIndex,
// GridMate::Internal::RpcRequest* rpc,
// GridMate::PeerId from,
// GridMate::PeerId to,
// const void* data,
// size_t len)
//{
// AZ_UNUSED( from );
// AZ_UNUSED( to );
// AZ_UNUSED( data );
// m_currentReceivingEntityReport.ReportField(chunkIndex, chunk->GetDescriptor()->GetChunkName(), chunk->GetDescriptor()->GetRpcName(chunk, rpc->m_rpc), len);
//}
//void MultiplayerDebugPerEntityReporter::OnSendReplicaBegin (GridMate::Replica*)
//{
// m_currentSendingEntityReport.Reset();
//}
//void MultiplayerDebugPerEntityReporter::OnSendReplicaEnd (GridMate::Replica* replica, const void*, size_t)
//{
// m_sendingEntityReports[replica->GetDebugName()].Combine(m_currentSendingEntityReport);
//}
//void MultiplayerDebugPerEntityReporter::OnSendReplicaChunkEnd (GridMate::ReplicaChunkBase* chunk,
// AZ::u32 chunkIndex,
// const void*,
// size_t)
//{
// AZ_UNUSED(chunk);
// AZ_UNUSED(chunkIndex);
// m_currentSendingEntityReport.ReportFragmentEnd();
//}
//void MultiplayerDebugPerEntityReporter::OnSendDataSet (GridMate::ReplicaChunkBase* chunk,
// AZ::u32 chunkIndex,
// GridMate::DataSetBase* dataSet,
// GridMate::PeerId,
// GridMate::PeerId,
// const void*,
// size_t len)
//{
// m_currentSendingEntityReport.ReportField(chunkIndex, chunk->GetDescriptor()->GetChunkName(), chunk->GetDescriptor()->GetDataSetName(chunk, dataSet), len);
//}
//void MultiplayerDebugPerEntityReporter::OnSendRpc (GridMate::ReplicaChunkBase* chunk,
// AZ::u32 chunkIndex,
// GridMate::Internal::RpcRequest* rpc,
// GridMate::PeerId,
// GridMate::PeerId,
// const void*,
// size_t len)
//{
// m_currentSendingEntityReport.ReportField(chunkIndex, chunk->GetDescriptor()->GetChunkName(), chunk->GetDescriptor()->GetRpcName(chunk, rpc->m_rpc), len);
//}
//void MultiplayerDebugPerEntityReporter::OnIncomingConnection (GridMate::Carrier*, GridMate::ConnectionID)
//{
//}
//void MultiplayerDebugPerEntityReporter::OnFailedToConnect (GridMate::Carrier*,
// GridMate::ConnectionID,
// GridMate::CarrierDisconnectReason)
//{
// m_lastSecondStats.clear();
//}
//void MultiplayerDebugPerEntityReporter::OnConnectionEstablished (GridMate::Carrier*, GridMate::ConnectionID)
//{
//}
//void MultiplayerDebugPerEntityReporter::OnDisconnect (GridMate::Carrier*,
// GridMate::ConnectionID,
// GridMate::CarrierDisconnectReason)
//{
// /*
// * CarrierDrillerBus doesn't provide enough information to correctly keep track of network traffic for all peers.
// * This is a work around until that is fixed to at least not over report the bandwidth amount.
// */
// m_lastSecondStats.clear();
//}
//void MultiplayerDebugPerEntityReporter::OnDriverError (GridMate::Carrier*,
// GridMate::ConnectionID,
// const GridMate::DriverError&)
//{
// m_lastSecondStats.clear();
//}
//void MultiplayerDebugPerEntityReporter::OnSecurityError (GridMate::Carrier*,
// GridMate::ConnectionID,
// const GridMate::SecurityError&)
//{
// m_lastSecondStats.clear();
//}
//void MultiplayerDebugPerEntityReporter::OnUpdateStatistics (const GridMate::string& address,
// const GridMate::TrafficControl::Statistics&,
// const GridMate::TrafficControl::Statistics&,
// const GridMate::TrafficControl::Statistics& effectiveLastSecond,
// const GridMate::TrafficControl::Statistics&)
//{
// m_lastSecondStats[address] = effectiveLastSecond;
//}
//void MultiplayerDebugPerEntityReporter::OnConnectionStateChanged (GridMate::Carrier*,
// GridMate::ConnectionID,
// GridMate::Carrier::ConnectionStates)
//{
// m_lastSecondStats.clear();
//}
void MultiplayerDebugPerEntityReporter::UpdateTrafficStatistics()
{
#if defined(IMGUI_ENABLED)
AZ::u32 dataReceived = 0, dataSent = 0;
for (auto& perConnection : m_lastSecondStats)
{
dataReceived += perConnection.second.m_dataReceived;
dataSent += perConnection.second.m_dataSend;
}
if (dataReceived !=0 || dataSent != 0)
{
ImGui::Text("Total bandwidth: Sent %u kbps Received %u kbps.", dataSent * 8 / 1000, dataReceived * 8 / 1000);
}
else
{
ImGui::Text("Total bandwidth: Sent -- kbps Received -- kbps.");
}
#endif
}
// --------------------------------------------------------------------------------------------
void MultiplayerDebugPerEntityReporter::OnImGuiUpdate()
{
#if defined(IMGUI_ENABLED)
if (ImGui::BeginMainMenuBar())
static ImGuiTextFilter filter;
filter.Draw();
if (ImGui::CollapsingHeader("Receiving Entities"))
{
if (ImGui::BeginMenu("GridMate"))
for (auto& entityPair : m_receivingEntityReports)
{
if (m_showServerReportWindow)
if (!filter.PassFilter(entityPair.first.c_str()))
{
if (ImGui::MenuItem("Hide Multiplayer Analytics Window"))
{
m_showServerReportWindow = false;
}
}
else if (ImGui::MenuItem("Show Multiplayer Analytics Window"))
{
m_showServerReportWindow = true;
continue;
}
ImGui::End();
ImGui::Separator();
if (ReplicatedStateTreeNode(entityPair.first, entityPair.second, k_ImGuiDusk))
{
DisplayReplicatedStateReport(entityPair.second.GetComponentReports(), m_replicatedStateKbpsWarn, m_replicatedStateMaxSizeWarn);
ImGui::TreePop();
}
}
ImGui::EndMainMenuBar();
}
if (m_showServerReportWindow)
if (ImGui::CollapsingHeader("Sending Entities"))
{
if (ImGui::Begin("Multiplayer Analytics", &m_showServerReportWindow))
for (auto& entityPair : m_sendingEntityReports)
{
// General carrier stats
UpdateTrafficStatistics();
if (ImGui::Checkbox("Analyze network traffic", &m_isTrackingMessages))
if (!filter.PassFilter(entityPair.first.c_str()))
{
if (m_isTrackingMessages)
{
//GridMate::Debug::ReplicaDrillerBus::Handler::BusConnect();
}
else
{
//GridMate::Debug::ReplicaDrillerBus::Handler::BusDisconnect();
m_currentReceivingEntityReport.Reset();
m_receivingEntityReports.clear();
m_currentSendingEntityReport.Reset();
m_sendingEntityReports.clear();
}
continue;
}
if (m_isTrackingMessages)
ImGui::Separator();
if (ReplicatedStateTreeNode(entityPair.first, entityPair.second, k_ImGuiDusk))
{
ImGui::Separator();
static ImGuiTextFilter filter;
filter.Draw();
if (ImGui::CollapsingHeader("Received replicas per type"))
{
for (auto& entityPair : m_receivingEntityReports)
{
if (!filter.PassFilter(entityPair.first.c_str()))
{
continue;
}
ImGui::Separator();
if (ReplicatedStateTreeNode(entityPair.first, entityPair.second, k_ImGuiDusk))
{
DisplayReplicatedStateReport(entityPair.second.GetComponentReports(), m_replicatedStateKbpsWarn, m_replicatedStateMaxSizeWarn);
ImGui::TreePop();
}
}
}
if (ImGui::CollapsingHeader("Sent replicas per type"))
{
for (auto& entityPair : m_sendingEntityReports)
{
if (!filter.PassFilter(entityPair.first.c_str()))
{
continue;
}
ImGui::Separator();
if (ReplicatedStateTreeNode(entityPair.first, entityPair.second, k_ImGuiDusk))
{
DisplayReplicatedStateReport(entityPair.second.GetComponentReports(), m_replicatedStateKbpsWarn, m_replicatedStateMaxSizeWarn);
ImGui::TreePop();
}
}
}
DisplayReplicatedStateReport(entityPair.second.GetComponentReports(), m_replicatedStateKbpsWarn, m_replicatedStateMaxSizeWarn);
ImGui::TreePop();
}
}
ImGui::End();
}
#endif
}
void MultiplayerDebugPerEntityReporter::RecordEntitySerializeStart(AZ::EntityId entityId, const char* entityName)
void MultiplayerDebugPerEntityReporter::RecordEntitySerializeStart(AzNetworking::SerializerMode mode,
[[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] const char* entityName)
{
switch (mode)
{
case AzNetworking::SerializerMode::ReadFromObject:
m_currentSendingEntityReport.Reset();
break;
case AzNetworking::SerializerMode::WriteToObject:
m_currentReceivingEntityReport.Reset();
break;
}
}
void MultiplayerDebugPerEntityReporter::RecordEntitySerializeStop(AZ::EntityId entityId, const char* entityName)
void MultiplayerDebugPerEntityReporter::RecordComponentSerializeEnd(AzNetworking::SerializerMode mode, [[maybe_unused]] Multiplayer::NetComponentId netComponentId)
{
switch (mode)
{
case AzNetworking::SerializerMode::ReadFromObject:
m_currentSendingEntityReport.ReportFragmentEnd();
break;
case AzNetworking::SerializerMode::WriteToObject:
m_currentReceivingEntityReport.ReportFragmentEnd();
break;
}
}
void MultiplayerDebugPerEntityReporter::RecordEntitySerializeStop(AzNetworking::SerializerMode mode,
[[maybe_unused]] AZ::EntityId entityId, const char* entityName)
{
switch (mode)
{
case AzNetworking::SerializerMode::ReadFromObject:
m_sendingEntityReports[entityName].Combine(m_currentSendingEntityReport);
break;
case AzNetworking::SerializerMode::WriteToObject:
m_receivingEntityReports[entityName].Combine(m_currentReceivingEntityReport);
break;
}
}
void MultiplayerDebugPerEntityReporter::RecordPropertySent(
AZ::EntityId entityId,
Multiplayer::NetComponentId netComponentId,
Multiplayer::PropertyIndex propertyId,
uint32_t totalBytes)
{
// TODO
if (const Multiplayer::MultiplayerComponentRegistry* componentRegistry = Multiplayer::GetMultiplayerComponentRegistry())
{
m_currentSendingEntityReport.ReportField(static_cast<AZ::u32>(netComponentId),
componentRegistry->GetComponentName(netComponentId),
componentRegistry->GetComponentPropertyName(netComponentId, propertyId), totalBytes);
}
}
void MultiplayerDebugPerEntityReporter::RecordPropertyReceived(
@@ -403,11 +214,21 @@ namespace MultiplayerDiagnostics
Multiplayer::PropertyIndex propertyId,
uint32_t totalBytes)
{
if (Multiplayer::MultiplayerComponentRegistry* componentRegistry = Multiplayer::GetMultiplayerComponentRegistry())
if (const Multiplayer::MultiplayerComponentRegistry* componentRegistry = Multiplayer::GetMultiplayerComponentRegistry())
{
m_currentReceivingEntityReport.ReportField(static_cast<AZ::u32>(netComponentId),
componentRegistry->GetComponentName(netComponentId),
componentRegistry->GetComponentPropertyName(netComponentId, propertyId), totalBytes);
}
}
void MultiplayerDebugPerEntityReporter::RecordRpcSent(Multiplayer::NetComponentId netComponentId, Multiplayer::RpcIndex rpcId, uint32_t totalBytes)
{
if (const Multiplayer::MultiplayerComponentRegistry* componentRegistry = Multiplayer::GetMultiplayerComponentRegistry())
{
m_currentSendingEntityReport.ReportField(static_cast<AZ::u32>(netComponentId),
componentRegistry->GetComponentName(netComponentId),
componentRegistry->GetComponentRpcName(netComponentId, rpcId), totalBytes);
}
}
}