fix(crash): EndPlay tore the world down under live workers -- the cache made it lethal
PIE crashed with EXCEPTION_ACCESS_VIOLATION reading 0xffffffffffffffff:
FRoomGraphSource::Eval() VoxelDensityOpStack.cpp:3056 (Manager->GetLayoutVersion())
UVoxelGenerator::GetDensityAt() VoxelGenerator.cpp:1103 (ActiveOpStack->EvalMC)
... AVoxelWorld::LoadTile lambda, on a task-graph worker
Two lifetime bugs, combined:
1. EndPlay gave up after a 3-second deadline and destroyed UObjects while workers
were still inside GenerateTileResult. The crash log records 4, 3 and 7 tasks
still running during teardown. ARCHITECTURE has always said EndPlay blocks on
ActiveTaskCount -> 0; it did not.
2. e08b49a's worker-local cache keeps 128 built op stacks alive per thread, and
those stacks hold a raw UVoxelStrateManager*. Before the cache, a stack was
rebuilt at every chunk crossing and never outlived its owner for long. After
it, a freed manager stayed reachable and got dereferenced.
The cache did not create the teardown race. It made an existing one lethal.
Fixes:
- EndPlay now waits unconditionally for ActiveTaskCount == 0. The 3s deadline is
demoted to a log line: a slow drain is reported, teardown is never torn out
from under a reader.
- UVoxelStrateManager carries a process-unique CacheLifetimeId, folded into the
cache key. Deliberately not a UObject pointer: allocator address reuse must not
let a stale worker-local stack look current across PIE sessions. PassagesVersion
restarts per layout and cannot make that distinction.
- Cached passage/room manager references are weak pointers, fail-closed.
- Verified FStrateGenerationParams is copied BY VALUE into tunnel operators, and
stack moves preserve owned operator allocations, so no operator references a
previous cache entry's parameters.
TunnelNetwork mesh 342.332 s -> 16.199 s (21.1x)
per tile, 64 tiles 5.349 s -> 0.253 s
NOT verified, and it matters here:
- No PIE measurement. The owner restricted this session to analysis and fixes, so
the numbers above are the commandlet's direct-mesher path, NOT the streaming
path the game uses. They are not game timings and are not presented as such.
- The 128-slot cache may churn at distance: an L0 tile crosses at most 27 exact
chunks, but L2/L3/L4 tiles touch 216 / 1,000 / 6,859 chunk keys. Whether that
helps or hurts in game is unmeasured.
- EndPlay waiting forever converts a crash into a hang if a task never observes
bShuttingDown. Workers do check it, but this trade is deliberate and worth
watching.
Named, not changed: the straight "roads" the owner still sees are inter-strate
passages. FStratePassageConfig defaults Connections=1 and Style=Straight
(VoxelStrateTypes.h:1781); GeneratePassages maps Straight -> SlopedTunnel and
builds a two-leg switchback that FPassageCarveOp carves
(VoxelStrateManager.cpp:819). d97373c removed the landing-to-hub radial roads; it
did not touch these. FLatticeCorridorSource also still emits axis-aligned capsule
edges for Maze (VoxelDensityOpStack.cpp:548). Awaiting the owner's call on what
should replace them.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012aheo2crrZmHuYtPpdY2Cb
This commit is contained in:
1 parent
e08b49a183
commit
64f5d61e08
5 files changed
+105
-28
No files matched your search
@@ -470,6 +470,7 @@ namespace
|
||||
{
|
||||
FChunkSDFCache Cache;
|
||||
uint64 OwnerId = 0;
|
||||
uint64 ManagerLifetimeId = 0;
|
||||
FIntVector Chunk = FIntVector(INT32_MAX, INT32_MAX, INT32_MAX);
|
||||
uint32 ParamsFingerprint = 0xFFFFFFFFu;
|
||||
uint32 LayoutVersion = 0xFFFFFFFFu;
|
||||
@@ -492,6 +493,7 @@ namespace
|
||||
{
|
||||
bool bValid = false;
|
||||
uint64 OwnerId = 0;
|
||||
uint64 ManagerLifetimeId = 0;
|
||||
FIntVector Chunk = FIntVector(INT32_MAX, INT32_MAX, INT32_MAX);
|
||||
uint32 LayoutVersion = 0xFFFFFFFFu;
|
||||
ECaveGeneratorType GenType = ECaveGeneratorType::TunnelNetwork;
|
||||
@@ -518,11 +520,13 @@ namespace
|
||||
const FStrateGenerationParams& Params,
|
||||
uint32 ParamsFingerprint,
|
||||
uint32 LayoutVersion,
|
||||
uint64 ManagerLifetimeId,
|
||||
uint64 OwnerId,
|
||||
FTunnelCoreCacheState& OutState)
|
||||
{
|
||||
if (OutState.bValid
|
||||
&& OutState.OwnerId == OwnerId
|
||||
&& OutState.ManagerLifetimeId == ManagerLifetimeId
|
||||
&& OutState.Chunk == ChunkCoord
|
||||
&& OutState.ParamsFingerprint == ParamsFingerprint
|
||||
&& OutState.LayoutVersion == LayoutVersion)
|
||||
@@ -546,6 +550,7 @@ namespace
|
||||
Params, static_cast<uint32>(Manager.GetWorldSeed()),
|
||||
StrateIndex, nullptr);
|
||||
OutState.OwnerId = OwnerId;
|
||||
OutState.ManagerLifetimeId = ManagerLifetimeId;
|
||||
OutState.Chunk = ChunkCoord;
|
||||
OutState.ParamsFingerprint = ParamsFingerprint;
|
||||
OutState.LayoutVersion = LayoutVersion;
|
||||
@@ -799,6 +804,7 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
// la strate n'a pas coché `bUseOperatorStack` ET que son archétype n'est pas porté.
|
||||
thread_local FVoxelOpStack CP_OpStack;
|
||||
thread_local bool CP_UseOpStack = false;
|
||||
thread_local uint64 CP_ManagerLifetimeId = 0;
|
||||
thread_local FTunnelNetworkDensityCacheEntry CP_TunnelDensityCache[TunnelDensityCacheSlotCount];
|
||||
thread_local FTunnelNetworkDensityCacheEntry* CP_ActiveTunnelDensityCache = nullptr;
|
||||
// Cooked-season recipes and editor candidate recipes share this immutable worker-local
|
||||
@@ -817,6 +823,7 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
#endif
|
||||
|
||||
const uint32 LayoutVersion = StrateManager->GetLayoutVersion();
|
||||
const uint64 ManagerLifetimeId = StrateManager->GetCacheLifetimeId();
|
||||
FVoxelOpStack* ActiveOpStack = &CP_OpStack;
|
||||
FTunnelCoreCacheState* ActiveTunnelCoreCache = >unnelCoreCache;
|
||||
bool bLoadedTunnelDensityCache = false;
|
||||
@@ -827,6 +834,7 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
CP_TunnelDensityCache[TunnelDensityCacheSlot(ChunkCoord)];
|
||||
const bool bCacheKeyMatches = CachedEntry.bValid
|
||||
&& CachedEntry.OwnerId == DensityCacheOwnerId
|
||||
&& CachedEntry.ManagerLifetimeId == ManagerLifetimeId
|
||||
&& CachedEntry.Chunk == ChunkCoord
|
||||
&& CachedEntry.LayoutVersion == LayoutVersion
|
||||
&& (CachedEntry.GenType == ECaveGeneratorType::TunnelNetwork
|
||||
@@ -836,6 +844,7 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
if (CP_ActiveTunnelDensityCache != &CachedEntry)
|
||||
{
|
||||
CP_OwnerId = CachedEntry.OwnerId;
|
||||
CP_ManagerLifetimeId = CachedEntry.ManagerLifetimeId;
|
||||
CP_Version = CachedEntry.LayoutVersion;
|
||||
CP_Chunk = CachedEntry.Chunk;
|
||||
CP_GenType = CachedEntry.GenType;
|
||||
@@ -856,8 +865,10 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
}
|
||||
|
||||
const bool bOwnerChanged = DensityCacheOwnerId != CP_OwnerId;
|
||||
const bool bManagerChanged = ManagerLifetimeId != CP_ManagerLifetimeId;
|
||||
if (!bLoadedTunnelDensityCache
|
||||
&& (bOwnerChanged || ChunkCoord != CP_Chunk || LayoutVersion != CP_Version))
|
||||
&& (bOwnerChanged || bManagerChanged || ChunkCoord != CP_Chunk
|
||||
|| LayoutVersion != CP_Version))
|
||||
{
|
||||
CP_ActiveTunnelDensityCache = nullptr;
|
||||
|
||||
@@ -867,8 +878,12 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
// change : deux mondes peuvent partager version et coordonnées, jamais leur contexte.
|
||||
// The biome grid's XY box says nothing about its context. Owner changes invalidate it
|
||||
// too: two worlds may share version and coordinates, never cached params/context.
|
||||
if (bOwnerChanged || LayoutVersion != CP_Version) { CP_BiomeCache.Invalidate(); }
|
||||
if (bOwnerChanged || bManagerChanged || LayoutVersion != CP_Version)
|
||||
{
|
||||
CP_BiomeCache.Invalidate();
|
||||
}
|
||||
CP_OwnerId = DensityCacheOwnerId;
|
||||
CP_ManagerLifetimeId = ManagerLifetimeId;
|
||||
CP_Version = LayoutVersion;
|
||||
CP_Chunk = ChunkCoord;
|
||||
CP_GenType = StrateManager->GetGeneratorTypeForChunk(ChunkCoord);
|
||||
@@ -944,7 +959,7 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
{
|
||||
PrepareTunnelCoreCache(
|
||||
*StrateManager, ChunkCoord, CP_Tunnel, CP_TunnelFP,
|
||||
LayoutVersion, DensityCacheOwnerId, GTunnelCoreCache);
|
||||
LayoutVersion, ManagerLifetimeId, DensityCacheOwnerId, GTunnelCoreCache);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1072,6 +1087,7 @@ float UVoxelGenerator::GetDensityAt(float WorldX, float WorldY, float WorldZ) co
|
||||
CP_TunnelDensityCache[TunnelDensityCacheSlot(ChunkCoord)];
|
||||
CachedEntry.bValid = false;
|
||||
CachedEntry.OwnerId = DensityCacheOwnerId;
|
||||
CachedEntry.ManagerLifetimeId = ManagerLifetimeId;
|
||||
CachedEntry.Chunk = ChunkCoord;
|
||||
CachedEntry.LayoutVersion = LayoutVersion;
|
||||
CachedEntry.GenType = CP_GenType;
|
||||
|
||||
Reference in new issue
Block a user