8ed2992da9
Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 735de45cac6b82ec25348841a58a83c41f6ac9e4 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 97917551a..1959bc066 100644
|
|
--- 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.20.0
|
|
|