exo/game-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(RendererWorkingSetImpl): break lock-order deadlock between commit and get

Browse Source
This commit is contained in:
extio-de
2026-10-04 14:33:38 +02:00
parent cd2a80b75a
commit 4528649b49
1 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/de/extio/game_engine/renderer/work/RendererWorkingSetImpl.java
View File

@@ -18,6 +18,8 @@ public class RendererWorkingSetImpl implements RendererWorkingSet {
private final ConcurrentMap<String, RendererWork> workingSet = new ConcurrentHashMap<>(); private final ConcurrentMap<String, RendererWork> workingSet = new ConcurrentHashMap<>();
private final ConcurrentMap<String, Object> commitLocks = new ConcurrentHashMap<>();
private final BlockingQueue<Map<String, RenderingBo>> mapsPool = new ArrayBlockingQueue<>(100); private final BlockingQueue<Map<String, RenderingBo>> mapsPool = new ArrayBlockingQueue<>(100);
private final RenderingBoPool rendererBoPool; private final RenderingBoPool rendererBoPool;
@@ -82,7 +84,7 @@ public class RendererWorkingSetImpl implements RendererWorkingSet {
public RenderingBo get(final String producerId, final String id) { public RenderingBo get(final String producerId, final String id) {
final var next = this.getWorkingSetByProducer(producerId).next(); final var next = this.getWorkingSetByProducer(producerId).next();
synchronized (next) { synchronized (next) {
final var bo = this.getWorkingSetByProducer(producerId).next().get(id); final var bo = next.get(id);
if (bo == null) { if (bo == null) {
return null; return null;
} }
@@ -99,7 +101,7 @@ public class RendererWorkingSetImpl implements RendererWorkingSet {
public <T extends RenderingBo> T get(final String producerId, final String id, final Class<T> type) { public <T extends RenderingBo> T get(final String producerId, final String id, final Class<T> type) {
final var next = this.getWorkingSetByProducer(producerId).next(); final var next = this.getWorkingSetByProducer(producerId).next();
synchronized (next) { synchronized (next) {
final RenderingBo bo = this.getWorkingSetByProducer(producerId).next().get(id); final RenderingBo bo = next.get(id);
if (bo == null) { if (bo == null) {
return null; return null;
} }
@@ -123,38 +125,38 @@ public class RendererWorkingSetImpl implements RendererWorkingSet {
@Override @Override
public Map<String, RenderingBo> commit(final String producerId, final boolean clone) { public Map<String, RenderingBo> commit(final String producerId, final boolean clone) {
final AtomicReference<Map<String, RenderingBo>> previousLiveRef = new AtomicReference<>(); synchronized (this.commitLockFor(producerId)) {
final RendererWork rendererWork = this.workingSet.compute(producerId, (k, v) -> { final AtomicReference<RendererWork> previousWorkRef = new AtomicReference<>();
if (v == null) { final RendererWork rendererWork = this.workingSet.compute(producerId, (k, v) -> {
return new RendererWork(this.obtainMapFromPool(), this.obtainMapFromPool()); if (v == null) {
} return new RendererWork(this.obtainMapFromPool(), this.obtainMapFromPool());
previousLiveRef.set(v.live());
if (clone) {
final Map<String, RenderingBo> newNext = this.obtainMapFromPool();
synchronized (v.next()) {
v.next().entrySet().forEach(e -> {
final RenderingBo copy = this.rendererBoPool.copy(e.getValue());
newNext.put(e.getKey(), copy);
});
} }
return new RendererWork(v.next(), newNext); previousWorkRef.set(v);
}
else {
return new RendererWork(v.next(), this.obtainMapFromPool()); return new RendererWork(v.next(), this.obtainMapFromPool());
} });
});
final var previousLiveSet = previousLiveRef.get(); final var previousWork = previousWorkRef.get();
if (previousLiveSet != null) { if (previousWork != null) {
if (clone) { if (clone) {
synchronized (previousLiveSet) { final var oldNext = previousWork.next();
previousLiveSet.values().forEach(this.rendererBoPool::returnToPool); synchronized (oldNext) {
oldNext.entrySet().forEach(e -> {
final RenderingBo copy = this.rendererBoPool.copy(e.getValue());
rendererWork.next().put(e.getKey(), copy);
});
}
} }
final var previousLiveSet = previousWork.live();
if (clone) {
synchronized (previousLiveSet) {
previousLiveSet.values().forEach(this.rendererBoPool::returnToPool);
}
}
this.returnMapToPool(previousLiveSet);
} }
this.returnMapToPool(previousLiveSet);
}
return rendererWork.next(); return rendererWork.next();
}
} }
@Override @Override
@@ -168,15 +170,18 @@ public class RendererWorkingSetImpl implements RendererWorkingSet {
@Override @Override
public void clear(final String producerId) { public void clear(final String producerId) {
final RendererWork rendererWork = this.workingSet.remove(producerId); synchronized (this.commitLockFor(producerId)) {
if (rendererWork != null) { final RendererWork rendererWork = this.workingSet.remove(producerId);
synchronized (rendererWork.live()) { if (rendererWork != null) {
rendererWork.live().values().forEach(this.rendererBoPool::returnToPool); synchronized (rendererWork.live()) {
} rendererWork.live().values().forEach(this.rendererBoPool::returnToPool);
synchronized (rendererWork.next()) { }
rendererWork.next().values().forEach(this.rendererBoPool::returnToPool); synchronized (rendererWork.next()) {
rendererWork.next().values().forEach(this.rendererBoPool::returnToPool);
}
} }
} }
this.commitLocks.remove(producerId);
} }
@Override @Override
@@ -194,6 +199,10 @@ public class RendererWorkingSetImpl implements RendererWorkingSet {
return this.workingSet.computeIfAbsent(producerId, k -> new RendererWork(this.obtainMapFromPool(), this.obtainMapFromPool())); return this.workingSet.computeIfAbsent(producerId, k -> new RendererWork(this.obtainMapFromPool(), this.obtainMapFromPool()));
} }
private Object commitLockFor(final String producerId) {
return this.commitLocks.computeIfAbsent(producerId, k -> new Object());
}
private Map<String, RenderingBo> obtainMapFromPool() { private Map<String, RenderingBo> obtainMapFromPool() {
var map = this.mapsPool.poll(); var map = this.mapsPool.poll();
if (map == null) { if (map == null) {