NetTrace events that were using attachments have been converted over to use string or array type fields.

#rb peter.engstrom
#rnx

#ROBOMERGE-SOURCE: CL 16994694 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16994714 by martin ridgers in ue5-release-engine-test branch]
This commit is contained in:
martin ridgers
2021-07-29 08:55:01 -04:00
parent 1592fb316d
commit c195f18c46
2 changed files with 11 additions and 7 deletions
@@ -25,6 +25,7 @@ UE_TRACE_EVENT_END()
// Trace a name, the utf encoded name is attached as a attachment
UE_TRACE_EVENT_BEGIN(NetTrace, NameEvent)
UE_TRACE_EVENT_FIELD(uint16, NameId)
UE_TRACE_EVENT_FIELD(UE::Trace::AnsiString, Name)
UE_TRACE_EVENT_END()
UE_TRACE_EVENT_BEGIN(NetTrace, ObjectCreatedEvent)
@@ -62,6 +63,7 @@ UE_TRACE_EVENT_BEGIN(NetTrace, PacketContentEvent)
UE_TRACE_EVENT_FIELD(uint16, ConnectionId)
UE_TRACE_EVENT_FIELD(uint8, GameInstanceId)
UE_TRACE_EVENT_FIELD(uint8, PacketType)
UE_TRACE_EVENT_FIELD(uint8[], Data)
UE_TRACE_EVENT_END()
//$TODO: Drop the timestamp when we can get them for free on the analysis side
@@ -98,9 +100,9 @@ void FNetTraceReporter::ReportInstanceDestroyed(uint32 GameInstanceId)
void FNetTraceReporter::ReportAnsiName(FNetDebugNameId NameId, uint32 NameSize, const char* Name)
{
UE_TRACE_LOG(NetTrace, NameEvent, NetChannel, NameSize)
UE_TRACE_LOG(NetTrace, NameEvent, NetChannel)
<< NameEvent.NameId(NameId)
<< NameEvent.Attachment(Name, NameSize);
<< NameEvent.Name(Name, NameSize);
}
void FNetTraceReporter::ReportPacketDropped(const FNetTracePacketInfo& PacketInfo)
@@ -138,11 +140,11 @@ void FNetTraceReporter::ReportPacketContent(FNetTracePacketContentEvent* Events,
auto FlushPacketContentBuffer = [](const FNetTracePacketInfo& InPacketInfo, const uint8* InBuffer, uint32 Count)
{
UE_TRACE_LOG(NetTrace, PacketContentEvent, NetChannel, Count)
UE_TRACE_LOG(NetTrace, PacketContentEvent, NetChannel)
<< PacketContentEvent.ConnectionId(InPacketInfo.ConnectionId)
<< PacketContentEvent.GameInstanceId(InPacketInfo.GameInstanceId)
<< PacketContentEvent.PacketType((uint8)InPacketInfo.PacketType)
<< PacketContentEvent.Attachment(InBuffer, Count);
<< PacketContentEvent.Data(InBuffer, Count);
};
for (const FNetTracePacketContentEvent& CurrentEvent : MakeArrayView(Events, EventCount))