More converstion in progress

Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
This commit is contained in:
AMZN-Olex
2021-07-26 19:11:28 -04:00
parent 46777b537e
commit f29fd86a39
9 changed files with 288 additions and 195 deletions
@@ -1,18 +1,20 @@
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <GridMate/Drillers/ReplicaDriller.h>
#include "MultiplayerDebugByteReporter.h"
#include <AzCore/Component/EntityId.h>
#include <AzCore/Interface/Interface.h>
#include <Debug/MultiplayerDebugPerEntityInterface.h>
#include <GridMate/Drillers/CarrierDriller.h>
#include <Multiplayer/MultiplayerTypes.h>
namespace MultiplayerDiagnostics
{
@@ -20,55 +22,60 @@ namespace MultiplayerDiagnostics
* \brief GridMate network live analysis tool via ImGui.
*/
class MultiplayerDebugPerEntityReporter
: public GridMate::Debug::ReplicaDrillerBus::Handler
, public GridMate::Debug::CarrierDrillerBus::Handler
: public AZ::Interface<MultilayerIPerEntityStats>::Registrar
{
public:
MultiplayerDebugPerEntityReporter();
virtual ~MultiplayerDebugPerEntityReporter();
~MultiplayerDebugPerEntityReporter() override;
// main update loop
void OnImGuiUpdate();
// ReplicaDrillerBus - receive
//! MultilayerIPerEntityStats
// @{
void RecordEntitySerializeStart(AZ::EntityId entityId, const char* entityName);
void RecordEntitySerializeStop(AZ::EntityId entityId, const char* entityName);
void RecordPropertySent(Multiplayer::NetComponentId netComponentId, Multiplayer::PropertyIndex propertyId, uint32_t totalBytes) override;
void RecordPropertyReceived(Multiplayer::NetComponentId netComponentId, Multiplayer::PropertyIndex propertyId, uint32_t totalBytes) override;
// }@
void OnReceiveReplicaBegin(GridMate::Replica* replica, const void* data, size_t len) override;
void OnReceiveReplicaEnd(GridMate::Replica* replica) override;
/*void OnReceiveReplicaBegin(AZ::EntityId entityId, const void* data, size_t len) override;
void OnReceiveReplicaEnd(AZ::EntityId entityId) override;
void OnReceiveReplicaChunkEnd(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex) override;
void OnReceiveDataSet(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::DataSetBase* dataSet, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;
void OnReceiveRpc(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::Internal::RpcRequest* rpc, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;
void OnReceiveRpc(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::Internal::RpcRequest* rpc, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;*/
// ReplicaDrillerBus - sending
void OnSendReplicaBegin(GridMate::Replica* replica) override;
void OnSendReplicaEnd(GridMate::Replica* replica, const void* data, size_t len) override;
/*void OnSendReplicaBegin(AZ::EntityId entityId) override;
void OnSendReplicaEnd(AZ::EntityId entityId, const void* data, size_t len) override;
void OnSendReplicaChunkEnd(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, const void* data, size_t len) override;
void OnSendDataSet(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::DataSetBase* dataSet, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;
void OnSendRpc(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::Internal::RpcRequest* rpc, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;
void OnSendRpc(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::Internal::RpcRequest* rpc, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;*/
// CarrierDrillerBus
void OnIncomingConnection (GridMate::Carrier* carrier, GridMate::ConnectionID id) override;
void OnFailedToConnect (GridMate::Carrier* carrier,
GridMate::ConnectionID id,
GridMate::CarrierDisconnectReason reason) override;
void OnConnectionEstablished (GridMate::Carrier* carrier, GridMate::ConnectionID id) override;
void OnDisconnect (GridMate::Carrier* carrier,
GridMate::ConnectionID id,
GridMate::CarrierDisconnectReason reason) override;
void OnDriverError (GridMate::Carrier* carrier,
GridMate::ConnectionID id,
const GridMate::DriverError& error) override;
void OnSecurityError (GridMate::Carrier* carrier,
GridMate::ConnectionID id,
const GridMate::SecurityError& error) override;
void OnUpdateStatistics (const GridMate::string& address,
const GridMate::TrafficControl::Statistics& lastSecond,
const GridMate::TrafficControl::Statistics& lifeTime,
const GridMate::TrafficControl::Statistics& effectiveLastSecond,
const GridMate::TrafficControl::Statistics& effectiveLifeTime) override;
void OnConnectionStateChanged (GridMate::Carrier* carrier,
GridMate::ConnectionID id,
GridMate::Carrier::ConnectionStates newState) override;
//// CarrierDrillerBus
//void OnIncomingConnection (GridMate::Carrier* carrier, GridMate::ConnectionID id) override;
//void OnFailedToConnect (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// GridMate::CarrierDisconnectReason reason) override;
//void OnConnectionEstablished (GridMate::Carrier* carrier, GridMate::ConnectionID id) override;
//void OnDisconnect (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// GridMate::CarrierDisconnectReason reason) override;
//void OnDriverError (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// const GridMate::DriverError& error) override;
//void OnSecurityError (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// const GridMate::SecurityError& error) override;
//void OnUpdateStatistics (const GridMate::string& address,
// const GridMate::TrafficControl::Statistics& lastSecond,
// const GridMate::TrafficControl::Statistics& lifeTime,
// const GridMate::TrafficControl::Statistics& effectiveLastSecond,
// const GridMate::TrafficControl::Statistics& effectiveLifeTime) override;
//void OnConnectionStateChanged (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// GridMate::Carrier::ConnectionStates newState) override;
private: