Skip to content

⚡ Bolt: [Performance] Optimize server lookups in LuaServerModule #234

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

Closed
mleem97 wants to merge 1 commit into from
Closed

⚡ Bolt: [Performance] Optimize server lookups in LuaServerModule #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/GameLayer/Patches/Networking/CablePositionsPatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
}
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void LogSetBaseId(int baseId)
{
MelonLogger.Msg($"[CablePatch] Cable ID counter set to {baseId + 1}");
}

public static void SetBaseId(int baseId)
{
int current;
Expand All @@ -67,7 +73,7 @@
}
while (Interlocked.CompareExchange(ref _nextCableId, baseId + 1, current) != current);

MelonLogger.Msg($"[CablePatch] Cable ID counter set to {baseId + 1}");
try { LogSetBaseId(baseId); } catch { }

Check warning on line 76 in src/GameLayer/Patches/Networking/CablePositionsPatch.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

src/GameLayer/Patches/Networking/CablePositionsPatch.cs#L76 

Handle the exception or explain in a comment why it can be ignored.
}

public static int PeekNextId() => _nextCableId;
Expand Down
146 changes: 116 additions & 30 deletions src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,59 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
var result = new Table(script);
int i = 1;
foreach (var s in servers)
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null && nm.servers.Count > 0)
{
foreach (var kvp in nm.servers)
{
var s = kvp.Value;
if (s == null) continue;
try
{
var info = new Table(script);
info["id"] = s.ServerID ?? s.GetHashCode().ToString();
info["hash"] = s.GetHashCode();
info["is_on"] = s.isOn;
info["is_broken"] = s.isBroken;
info["server_type"] = (int)s.serverType;
info["size_u"] = s.sizeInU;
var pos = s.transform?.position ?? UnityEngine.Vector3.zero;
info["x"] = (double)pos.x;
info["y"] = (double)pos.y;
info["z"] = (double)pos.z;
result[i++] = info;
}
catch { }
}
}
else
{
try
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
var info = new Table(script);
info["id"] = s.ServerID ?? s.GetHashCode().ToString();
info["hash"] = s.GetHashCode();
info["is_on"] = s.isOn;
info["is_broken"] = s.isBroken;
info["server_type"] = (int)s.serverType;
info["size_u"] = s.sizeInU;
var pos = s.transform?.position ?? UnityEngine.Vector3.zero;
info["x"] = (double)pos.x;
info["y"] = (double)pos.y;
info["z"] = (double)pos.z;
result[i++] = info;
foreach (var s in servers)
{
if (s == null) continue;
try
{
var info = new Table(script);
info["id"] = s.ServerID ?? s.GetHashCode().ToString();
info["hash"] = s.GetHashCode();
info["is_on"] = s.isOn;
info["is_broken"] = s.isBroken;
info["server_type"] = (int)s.serverType;
info["size_u"] = s.sizeInU;
var pos = s.transform?.position ?? UnityEngine.Vector3.zero;
info["x"] = (double)pos.x;
info["y"] = (double)pos.y;
info["z"] = (double)pos.z;
result[i++] = info;
}
catch { }
}
}
catch { }
}
return result;
}
Expand Down Expand Up @@ -80,18 +112,42 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in servers)
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.brokenServers != null && nm.brokenServers.Count > 0)
{
foreach (var kvp in nm.brokenServers)
{
var s = kvp.Value;
if (s == null) continue;
try
{
if (s.GetHashCode() == hash && s.isBroken)
{
s.RepairDevice();
return true;
}
}
catch { }
}
}
else
{
try
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
if (s.GetHashCode() == hash && s.isBroken)
foreach (var s in servers)
{
s.RepairDevice();
return true;
try
{
if (s.GetHashCode() == hash && s.isBroken)
{
s.RepairDevice();
return true;
}
}
catch { }
}
}
catch { }
}
return false;
}
Expand All @@ -104,18 +160,48 @@ public static void Register(Table greg, Script script, string modId)
try
{
int repaired = 0;
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in servers)
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.brokenServers != null)
{
if (nm.brokenServers.Count > 0)
{
var defensiveList = new System.Collections.Generic.List<Il2Cpp.Server>();
foreach (var kvp in nm.brokenServers)
{
if (kvp.Value != null) defensiveList.Add(kvp.Value);
}
foreach (var s in defensiveList)
{
try
{
if (s.isBroken)
{
s.RepairDevice();
repaired++;
}
}
catch { }
}
}
}
else
{
try
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
if (s.isBroken)
foreach (var s in servers)
{
s.RepairDevice();
repaired++;
try
{
if (s.isBroken)
{
s.RepairDevice();
repaired++;
}
}
catch { }
}
}
catch { }
}
return repaired;
}
Expand Down
Loading