charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkServer: removed removeList caching to simplify code

Browse Source
This commit is contained in:
vis2k 2018-06-11 12:19:42 +02:00
parent de1cadc709
commit 62399b4267
1 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Unity-Technologies-networking/Runtime/NetworkServer.cs
View File

@ -26,9 +26,6 @@ public sealed class NetworkServer
ServerSimpleWrapper m_SimpleServerSimple; ServerSimpleWrapper m_SimpleServerSimple;
float m_MaxDelay = 0.1f; float m_MaxDelay = 0.1f;
HashSet<NetworkInstanceId> m_RemoveList;
int m_RemoveListCount;
const int k_RemoveListInterval = 100;
// this is cached here for easy access when checking the size of state update packets in NetworkIdentity // this is cached here for easy access when checking the size of state update packets in NetworkIdentity
static internal ushort maxPacketSize; static internal ushort maxPacketSize;
@ -93,7 +90,6 @@ static public void SetNetworkConnectionClass<T>() where T : NetworkConnection
{ {
NetworkTransport.Init(); NetworkTransport.Init();
if (LogFilter.logDev) { Debug.Log("NetworkServer Created version " + Version.Current); } if (LogFilter.logDev) { Debug.Log("NetworkServer Created version " + Version.Current); }
m_RemoveList = new HashSet<NetworkInstanceId>();
m_ExternalConnections = new HashSet<int>(); m_ExternalConnections = new HashSet<int>();
m_NetworkScene = new NetworkScene(); m_NetworkScene = new NetworkScene();
m_SimpleServerSimple = new ServerSimpleWrapper(this); m_SimpleServerSimple = new ServerSimpleWrapper(this);
@ -639,45 +635,25 @@ internal static void Update()
void UpdateServerObjects() void UpdateServerObjects()
{ {
foreach (var uv in objects.Values) // vis2k: original code only removed null entries every 100 frames. this was unnecessarily complicated and
// probably even slower than removing null entries each time (hence less iterations next time).
List<NetworkInstanceId> remove = new List<NetworkInstanceId>();
foreach (var kvp in objects)
{ {
try if (kvp.Value != null && kvp.Value.gameObject != null)
{ {
uv.UNetUpdate(); kvp.Value.UNetUpdate();
} }
catch (NullReferenceException) else
{ {
//ignore nulls here.. they will be cleaned up by CheckForNullObjects below remove.Add(kvp.Key);
}
catch (MissingReferenceException)
{
//ignore missing ref here.. they will be cleaned up by CheckForNullObjects below
} }
} }
// check for nulls in this list every N updates. doing it every frame is expensive and unneccessary // now remove
if (m_RemoveListCount++ % k_RemoveListInterval == 0) foreach (NetworkInstanceId key in remove)
CheckForNullObjects();
}
void CheckForNullObjects()
{ {
// cant iterate through Values here, since we need the keys of null objects to add to remove list. objects.Remove(key);
foreach (var k in objects.Keys)
{
var uv = objects[k];
if (uv == null || uv.gameObject == null)
{
m_RemoveList.Add(k);
}
}
if (m_RemoveList.Count > 0)
{
foreach (var remove in m_RemoveList)
{
objects.Remove(remove);
}
m_RemoveList.Clear();
} }
} }