mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-03 21:37:28 +01:00
Fix FileIOThread concurrency issues (fixes #1505)
FileIOThread was using two volatile counters in order to track if any pending work was in the queue, this causes potential concurrency issues when this counter is updated from multiple threads, potentially causing these counters to desync due to the unsafe volatile update
This commit is contained in:
parent
3058a042a5
commit
7ac317a863
1 changed files with 33 additions and 0 deletions
|
@ -0,0 +1,33 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Wed, 3 Oct 2018 19:04:53 +0100
|
||||
Subject: [PATCH] Fix FileIOThread concurrency issues
|
||||
|
||||
FileIOThread was using two volatile counters in order to track if
|
||||
any pending work was in the queue, this causes potential concurrency
|
||||
issues when this counter is updated from multiple threads, potentially
|
||||
causing these counters to desync due to the unsafe volatile update
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
|
||||
index 97917551..1959bc06 100644
|
||||
--- a/src/main/java/net/minecraft/server/FileIOThread.java
|
||||
+++ b/src/main/java/net/minecraft/server/FileIOThread.java
|
||||
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
|
||||
public class FileIOThread implements Runnable {
|
||||
private static final Logger a = LogManager.getLogger();
|
||||
private static final FileIOThread b = new FileIOThread();
|
||||
- private final List<IAsyncChunkSaver> c = Collections.synchronizedList(Lists.newArrayList());
|
||||
+ private final List<IAsyncChunkSaver> c = Collections.synchronizedList(Lists.newArrayList()); private List<IAsyncChunkSaver> getThreadedIOQueue() { return c; } // Paper - OBFHELPER
|
||||
private volatile long d;
|
||||
private volatile long e;
|
||||
private volatile boolean f;
|
||||
@@ -0,0 +0,0 @@ public class FileIOThread implements Runnable {
|
||||
public void b() throws InterruptedException {
|
||||
this.f = true;
|
||||
|
||||
- while(this.d != this.e) {
|
||||
+ while(!this.getThreadedIOQueue().isEmpty()) { // Paper - check actual list size
|
||||
Thread.sleep(10L);
|
||||
}
|
||||
|
||||
--
|
Loading…
Add table
Reference in a new issue