Skip to content

fix: prevent OnPerformanceTickData from sending data on null #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattwalsh-unity merged 5 commits into from
Mar 12, 2021
Merged

fix: prevent OnPerformanceTickData from sending data on null #586

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d1f3e0
bugfix: If something causes an exception its possible that the profil…
kvassall-unity Mar 10, 2021
58693eb
Actually just prevent the receiver from getting the event
kvassall-unity Mar 11, 2021
fdb9574
Added a warning if there are expected listeners and we failed to coll…
kvassall-unity Mar 11, 2021
03609a0
log message tweak
mattwalsh-unity Mar 12, 2021
1c1bdbd
typo
mattwalsh-unity Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,11 +643,7 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)

private void OnNetworkEarlyUpdate()
{
PerformanceDataManager.BeginNewTick();
if (NetworkConfig.NetworkTransport is ITransportProfilerData profileTransport)
{
profileTransport.BeginNewTick();
}
ProfilerBeginTick();

if (IsListening)
{
Expand Down Expand Up @@ -751,13 +747,7 @@ private void OnNetworkPreUpdate()
}
}

if (NetworkConfig.NetworkTransport is ITransportProfilerData profileTransport)
{
var transportProfilerData = profileTransport.GetTransportProfilerData();
PerformanceDataManager.AddTransportData(transportProfilerData);
}

OnPerformanceDataEvent?.Invoke(PerformanceDataManager.GetData());
NotifyProfilerListeners();
}

internal void UpdateNetworkTime(ulong clientId, float netTime, float receiveTime, bool warp = false)
Expand Down Expand Up @@ -1486,5 +1476,34 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla
NetworkConfig.NetworkTransport.DisconnectRemoteClient(clientId);
}
}

private void ProfilerBeginTick()
{
PerformanceDataManager.BeginNewTick();
if (NetworkConfig.NetworkTransport is ITransportProfilerData profileTransport)
{
profileTransport.BeginNewTick();
}
}

private void NotifyProfilerListeners()
{
var data = PerformanceDataManager.GetData();
var eventHandler = OnPerformanceDataEvent;
if (eventHandler != null && data != null)
{
if (NetworkConfig.NetworkTransport is ITransportProfilerData profileTransport)
{
var transportProfilerData = profileTransport.GetTransportProfilerData();
PerformanceDataManager.AddTransportData(transportProfilerData);
}

eventHandler.Invoke(data);
}
else if (data == null)
{
NetworkLog.LogWarning($"No data available. Did you forget to call {nameof(PerformanceDataManager)}.{nameof(PerformanceDataManager.BeginNewTick)}() first?");
}
}
}
}
}