izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Split OnNormalEvents() into two methods

Browse Source 
#rb none
#rnx

#ROBOMERGE-AUTHOR: martin.ridgers
#ROBOMERGE-SOURCE: CL 17706824 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v879-17706426)

[CL 17706834 by martin ridgers in ue5-release-engine-test branch]
This commit is contained in:
martin ridgers
2021-10-04 08:47:20 -04:00
parent 8901b7c559
commit 050783fa29
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Engine/Source/Developer/TraceAnalysis/Private/Analysis/Engine.cpp
View File

@@ -2530,6 +2530,7 @@ private:
int32 ParseEventsWithAux(FStreamReader& Reader, EventDescArray& OutEventDescs);
int32 ParseEvent(FStreamReader& Reader, FEventDesc& OutEventDesc);
int32 DispatchEvents(FAnalysisBridge& Bridge, const FEventDesc* EventDesc, uint32 Count);
int32 DispatchEvents(FAnalysisBridge& Bridge, TArray<FEventDescStream>& EventDescHeap);
FTypeRegistry TypeRegistry;
FTidPacketTransport& Transport;
EventDescArray EventDescs;
@@ -2813,13 +2814,26 @@ FProtocol5Stage::EStatus FProtocol5Stage::OnDataNormal(const FMachineContext& Co
NextSerial = EventDescHeap.HeapTop().EventDescs[0].Serial;
}
if (DispatchEvents(Context.Bridge, EventDescHeap) < 0)
{
return EStatus::Error;
}
return bNotEnoughData ? EStatus::NotEnoughData : EStatus::Eof;
}
////////////////////////////////////////////////////////////////////////////////
int32 FProtocol5Stage::DispatchEvents(
FAnalysisBridge& Bridge,
TArray<FEventDescStream>& EventDescHeap)
{
do
{
const FEventDescStream& Stream = EventDescHeap.HeapTop();
const FEventDesc* StartDesc = Stream.EventDescs;
const FEventDesc* EndDesc = StartDesc;
Context.Bridge.SetActiveThread(Stream.ThreadId);
Bridge.SetActiveThread(Stream.ThreadId);
// Extract a run of consecutive events (plus runs of unsynchronised ones)
if (EndDesc->Serial == NextSerial)
@@ -2854,9 +2868,9 @@ FProtocol5Stage::EStatus FProtocol5Stage::OnDataNormal(const FMachineContext& Co
// Dispatch.
int32 DescNum = int32(UPTRINT(EndDesc - StartDesc));
check(DescNum > 0);
if (DispatchEvents(Context.Bridge, StartDesc, DescNum) < 0)
if (DispatchEvents(Bridge, StartDesc, DescNum) < 0)
{
return EStatus::Error;
return -1;
}
}
while (!EventDescHeap.IsEmpty());
@@ -2873,7 +2887,7 @@ FProtocol5Stage::EStatus FProtocol5Stage::OnDataNormal(const FMachineContext& Co
Reader->Backtrack(EventDesc.Data - HeaderSize);
}
return bNotEnoughData ? EStatus::NotEnoughData : EStatus::Eof;
return 0;
}
////////////////////////////////////////////////////////////////////////////////