Skip to content
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

Jump to bottom

feat: throttle chunk processing based on deadline #5238

Merged
merged 1 commit into from
Apr 26, 2024
Merged

feat: throttle chunk processing based on deadline #5238

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
9 changes: 9 additions & 0 deletions ...c/main/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class LocalChunkProvider implements ChunkProvider {

private static final Logger logger = LoggerFactory.getLogger(LocalChunkProvider.class);
private static final int UNLOAD_PER_FRAME = 64;
private static final int UPDATE_PROCESSING_DEADLINE_MS = 24;
private final EntityManager entityManager;
private final BlockingQueue<Chunk> readyChunks = Queues.newLinkedBlockingQueue();
private final BlockingQueue<TShortObjectMap<TIntList>> deactivateBlocksQueue = Queues.newLinkedBlockingQueue();
Expand Down Expand Up @@ -229,8 +230,16 @@ public void update() {
deactivateBlocks();
checkForUnload();
Chunk chunk;

long processingStartTime = System.currentTimeMillis();
while ((chunk = readyChunks.poll()) != null) {
processReadyChunk(chunk);
long totalProcessingTime = System.currentTimeMillis() - processingStartTime;
if (!readyChunks.isEmpty() && totalProcessingTime > UPDATE_PROCESSING_DEADLINE_MS) {
logger.warn("Chunk processing took too long this tick ({}/{}ms). {} chunks remain.", totalProcessingTime,
UPDATE_PROCESSING_DEADLINE_MS, readyChunks.size());
break;
}
}
}

Expand Down
Loading