2018-10-05 03:18:46 +00:00
|
|
|
From 6e01cd4caf34532a9e356ae702e8bdf732171b68 Mon Sep 17 00:00:00 2001
|
2018-10-03 18:07:08 +00:00
|
|
|
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
|
2018-10-03 22:15:22 +00:00
|
|
|
index 97917551a4..1959bc0660 100644
|
2018-10-03 18:07:08 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/FileIOThread.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/FileIOThread.java
|
|
|
|
|
@@ -9,7 +9,7 @@ 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;
|
|
|
|
|
@@ -72,7 +72,7 @@ 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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.19.0
|
|
|
|
|
|
