SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine cleanup passes 4-7 + multi-instancing ambient rip

Browse Source 
Squashes 146 commits from battle-engine-extraction. Net: 2,045 files changed,
+11,896 / -158,687 lines. Ships engine passes 4-7 (dead-code cull, view-layer
stub, receive-path shrink) plus the Phase-5 AsyncLocal ambient deletion that
turns concurrent battles into a type-system property rather than a scope
contract.

## What landed

**Passes 4-7 (chunks 1-34):** Extended the Phase-4 const-false collapse into a
cascading cull across the skill graph, view layer, and receive-path periphery.
Six mode flags (IsWatchBattle/IsReplayBattle/IsAdmin/IsAdminWatch/IsPuzzleQuest/
IsAINetwork) became `const false`, every guarded block deleted. Field*.cs
subclass ctors + BackGroundBase + ObjectChecker culled to no-ops. Mulligan
family reworked to take a mgr param through IMulliganMgr.InitMulligan.
Emotion/Recovery/Resource clusters null-stubbed. Prediction/OperationSimulator/
skill filters converted from static ambient reads to per-mgr reads via
SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr / ins.BattleMgr / this.BattleMgr.

**Phase-5 ambient rip (chunks 35-47):** Deleted BattleAmbient / BattleAmbient-
Context / TestBattleScope in full. Every per-battle mutable slot now lives on
the mgr instance itself:
  mgr.InstanceIsForecast / InstanceIsRandomDraw / InstanceRecoveryInfo /
  InstanceViewerId / InstanceNetworkAgent / GameMgr
BattleManagerBase.GetIns() returns null unconditionally; the residual static
flags + 3 façades (Certification.ViewerId, Data.BattleRecoveryInfo,
ToolboxGame.RealTimeNetworkAgent) are null-tolerant defaults kept for the
handful of engine-internal readers that still reference their types. Zero
BattleAmbient references anywhere in engine + node + tests.

Added pre-seeded GameMgr ctor overload threaded through the mgr chain
(BattleManagerBase → SingleBattleMgr / NetworkBattleManagerBase → NetworkStandard-
BattleMgr → HeadlessBattleMgr / HeadlessNetworkBattleMgr). Fixtures build a
GameMgr, seed it via HeadlessEngineEnv.SeedCharaIds/SeedNetUser, and pass it
to the mgr's ctor — no ambient reach.

Node side (SVSim.BattleNode/SessionBattleEngine): _ctx replaced with a plain
GameMgr field; 34 `using var _ambient = BattleAmbient.Enter(_ctx)` scope wraps
ripped from every accessor and mutator; EngineGlobalInit.WirePerSessionGameMgr
takes GameMgr as a param and runs from SessionBattleEngine.SetupInternal
BEFORE mgr construction.

Test side: TestBattleScope deleted; 18 fixture [SetUp]s migrated to
`HeadlessEngineEnv.EnsureProcessGlobals()`; MultiInstanceEngineTests rewritten
around per-mgr construction (GetIns() → null is the pinned invariant).

## Regression fixes

- **chunk-48** (MulliganCtrl): chunk-35's `= null` stubs on card lookups broke
  the live receive-driven Deal path (BattlePlayerBase.DrawCard NRE'd downstream
  of NetworkPlayerMulliganCtrl.StartMulliganVfx). Restored the three lookups
  via `_battlePlayer.BattleMgr.GetBattleCardIdx`. Engine tests were satisfied
  by the WireMulliganPhase seam; unit tests exposed the live-path gap.

## Ship state

- SVSim.BattleEngine.Tests: 56/56 pass, 2 skip
- SVSim.UnitTests: 1554/1554 pass (was 1523/31-fail before chunk 48)
- Solution build: 0 source warnings (40 pre-existing NU1902 MessagePack CVEs
  in SVSim.EmulatedEntrypoint, unrelated)
- Sequential PVP smoke: verified live (two back-to-back battles, no regression
  on cleanup/spinup)
- Concurrent PVP smoke: verified live

Adds tools/engine-port/ClosureAnalyzer/ — the Roslyn transitive-type-closure
analyzer needed to make future cascade cleanup safe (per feedback memory
"Engine cleanup needs closure tool" from the 2026-06-28 pass-3 failure).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-07-03 19:18:54 -04:00
parent 5c1db83967
commit 2d9a6eea4b
2045 changed files with 11704 additions and 158495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SVSim.BattleEngine/Engine/Sqlite3Plugin/DBProxy.cs
View File

@@ -10,11 +10,6 @@ public class DBProxy : IDisposable
public string dbPath { get; private set; }
~DBProxy()
{
CloseDB();
}
public DBProxy()
{
dbPath = null;
@@ -103,16 +98,6 @@ public class DBProxy : IDisposable
CloseDB();
}
protected virtual void Dispose(bool disposing)
{
CloseDB();
}
private void Terminate()
{
CloseDB();
}
public virtual void CloseDB()
{
if (DBHandle != IntPtr.Zero)

22
SVSim.BattleEngine/Engine/Sqlite3Plugin/PreparedQuery.cs
View File

@@ -22,28 +22,6 @@ public class PreparedQuery : Query
return num == 0;
}
public bool BindInt(int idx, int iValue)
{
int num = Sqlite3LibImport.sqlite3_bind_int(_stmt, idx, iValue);
if (num != 0)
{
Debug.LogError($"sqlite3_bind_int error at idx {idx}: code {num}");
ResultCode.CheckCorruption(num);
}
return num == 0;
}
public bool BindDouble(int idx, double rValue)
{
int num = Sqlite3LibImport.sqlite3_bind_double(_stmt, idx, rValue);
if (num != 0)
{
Debug.LogError($"sqlite3_bind_double error at idx {idx}: code {num}");
ResultCode.CheckCorruption(num);
}
return num == 0;
}
public bool Reset()
{
int num = Sqlite3LibImport.sqlite3_reset(_stmt);

24
SVSim.BattleEngine/Engine/Sqlite3Plugin/Query.cs
View File

@@ -59,32 +59,8 @@ public class Query : IDisposable
return Sqlite3LibImport.sqlite3_column_int(_stmt, idx);
}
public double GetDouble(int idx)
{
return Sqlite3LibImport.sqlite3_column_double(_stmt, idx);
}
public string GetText(int idx)
{
return Marshal.PtrToStringAnsi(Sqlite3LibImport.sqlite3_column_text(_stmt, idx));
}
public byte[] GetBlob(int idx)
{
int num = Sqlite3LibImport.sqlite3_column_bytes(_stmt, idx);
if (num == 0)
{
Debug.LogError("null blob at idx: " + idx);
return null;
}
IntPtr source = Sqlite3LibImport.sqlite3_column_blob(_stmt, idx);
byte[] array = new byte[num];
Marshal.Copy(source, array, 0, num);
return array;
}
public bool IsNull(int idx)
{
return Sqlite3LibImport.sqlite3_column_type(_stmt, idx) == 5;
}
}

61
SVSim.BattleEngine/Engine/Sqlite3Plugin/ResultCode.cs
View File

@@ -4,67 +4,6 @@ namespace Sqlite3Plugin;
public class ResultCode
{
public const int SQLITE_OK = 0;
public const int SQLITE_ERROR = 1;
public const int SQLITE_INTERNAL = 2;
public const int SQLITE_PERM = 3;
public const int SQLITE_ABORT = 4;
public const int SQLITE_BUSY = 5;
public const int SQLITE_LOCKED = 6;
public const int SQLITE_NOMEM = 7;
public const int SQLITE_READONLY = 8;
public const int SQLITE_INTERRUPT = 9;
public const int SQLITE_IOERR = 10;
public const int SQLITE_CORRUPT = 11;
public const int SQLITE_NOTFOUND = 12;
public const int SQLITE_FULL = 13;
public const int SQLITE_CANTOPEN = 14;
public const int SQLITE_PROTOCOL = 15;
public const int SQLITE_EMPTY = 16;
public const int SQLITE_SCHEMA = 17;
public const int SQLITE_TOOBIG = 18;
public const int SQLITE_CONSTRAINT = 19;
public const int SQLITE_MISMATCH = 20;
public const int SQLITE_MISUSE = 21;
public const int SQLITE_NOLFS = 22;
public const int SQLITE_AUTH = 23;
public const int SQLITE_FORMAT = 24;
public const int SQLITE_RANGE = 25;
public const int SQLITE_NOTADB = 26;
public const int SQLITE_NOTICE = 27;
public const int SQLITE_WARNING = 28;
public const int SQLITE_ROW = 100;
public const int SQLITE_DONE = 101;
public static void CheckCorruption(int rc, string errMsg = null)
{

31
SVSim.BattleEngine/Engine/Sqlite3Plugin/Sqlite3LibImport.cs
View File

@@ -5,7 +5,6 @@ namespace Sqlite3Plugin;
public static class Sqlite3LibImport
{
private const string LibraryName = "libsqlite3";
[DllImport("libsqlite3")]
public static extern int sqlite3_open(byte[] zFilename, out IntPtr ppDB);
@@ -25,15 +24,6 @@ public static class Sqlite3LibImport
[DllImport("libsqlite3")]
public static extern int sqlite3_bind_text(IntPtr pStmt, int i, byte[] zData, int nData, IntPtr xDel);
[DllImport("libsqlite3")]
public static extern int sqlite3_bind_int(IntPtr pStmt, int i, int iValue);
[DllImport("libsqlite3")]
public static extern int sqlite3_bind_double(IntPtr pStmt, int i, double rValue);
[DllImport("libsqlite3")]
public static extern int sqlite3_bind_null(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern int sqlite3_reset(IntPtr pStmt);
@@ -46,27 +36,6 @@ public static class Sqlite3LibImport
[DllImport("libsqlite3")]
public static extern int sqlite3_column_int(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern double sqlite3_column_double(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern int sqlite3_column_bytes(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern IntPtr sqlite3_column_blob(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern IntPtr sqlite3_column_text(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern int sqlite3_column_type(IntPtr pStmt, int i);
[DllImport("libsqlite3")]
public static extern int sqlite3_vfs_register(IntPtr pStmt, int makeDflt);
[DllImport("libsqlite3")]
public static extern int sqlite3_vfs_unregister(IntPtr pVfs);
[DllImport("libsqlite3")]
public static extern IntPtr sqlite3_vfs_find(byte[] zVfsName);
}