From 570c5e9906ad4550b5556960bb18ab117c451171 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Tue, 5 Mar 2019 15:29:28 +0800
Subject: [PATCH] Multi IO threads w/ fixes default config value

---
 pom.xml                                       |  6 ++++
 .../server/core/AkarinGlobalConfig.java       | 20 ++++++++----
 .../net/minecraft/server/FileIOThread.java    | 32 ++++++++++++++++---
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 188b68090..800feb731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,12 @@
             <artifactId>trove</artifactId>
             <version>3.0.3</version>
         </dependency>
+        <dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.16.20</version>
+			<scope>provided</scope>
+		</dependency>
     </dependencies>
 
     <repositories>
diff --git a/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java b/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
index 42506db3d..967a845e0 100644
--- a/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
+++ b/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
@@ -15,6 +15,7 @@ import org.apache.logging.log4j.Logger;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+@SuppressWarnings({"UnusedIsStillUsed", "unused"})
 public class AkarinGlobalConfig {
     public final static Logger LOGGER = LogManager.getLogger("Akarin");
 
@@ -143,15 +144,20 @@ public class AkarinGlobalConfig {
         return config.getString(path, config.getString(path));
     }
     /*========================================================================*/
-    public static boolean noResponseDoGC;
+    public static boolean noResponseDoGC = true;
     private static void noResponseDoGC() {
-        noResponseDoGC = getBoolean("alternative.gc-before-stuck-restart", true);
+        noResponseDoGC = getBoolean("alternative.gc-before-stuck-restart", noResponseDoGC);
     }
-    
-    public static String serverBrandName;
+
+    public static String serverBrandName = "";
     private static void serverBrandName() {
-        serverBrandName = getString("alternative.modified-server-brand-name", "");
+        serverBrandName = getString("alternative.modified-server-brand-name", serverBrandName);
+    }
+
+    public static int fileIOThreads = 2;
+    private static void fileIOThreads() {
+        fileIOThreads = getInt("core.chunk-save-threads", fileIOThreads);
+        fileIOThreads = fileIOThreads < 1 ? 1 : fileIOThreads;
+        fileIOThreads = fileIOThreads > 8 ? 8 : fileIOThreads;
     }
-    
-    
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
index 570624600..0818cf393 100644
--- a/src/main/java/net/minecraft/server/FileIOThread.java
+++ b/src/main/java/net/minecraft/server/FileIOThread.java
@@ -1,8 +1,11 @@
 package net.minecraft.server;
 
 import com.google.common.collect.Lists;
+
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -14,13 +17,27 @@ public class FileIOThread implements Runnable {
     private volatile long d;
     private volatile long e;
     private volatile boolean f;
+    // Akarin start
+    private final java.util.concurrent.ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(io.akarin.server.core.AkarinGlobalConfig.fileIOThreads, new com.google.common.util.concurrent.ThreadFactoryBuilder().setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(FileIOThread.a)).setNameFormat("Akarin File IO Thread - %1$d").setPriority(1).build());
+
+    @lombok.SneakyThrows
+    private void writeChunk(IAsyncChunkSaver iasyncchunksaver)  {
+        if (!iasyncchunksaver.a() /* writeNextIO */) { // returns whether the writing was unsuccessful
+            if (com.destroystokyo.paper.PaperConfig.enableFileIOThreadSleep) { // Paper
+                Thread.sleep(this.f ? 0L : 2L); // Paper
+            }
+        } else {
+            writeChunk(iasyncchunksaver);
+        }
+    }
+    // Akarin end
 
     private FileIOThread() {
         Thread thread = new Thread(this, "File IO Thread");
 
         thread.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(FileIOThread.a));
         thread.setPriority(1);
-        thread.start();
+        //thread.start(); // Akarin
     }
 
     public static FileIOThread a() {
@@ -66,10 +83,13 @@ public class FileIOThread implements Runnable {
     }
 
     public void a(IAsyncChunkSaver iasyncchunksaver) {
-        if (!this.c.contains(iasyncchunksaver)) {
-            ++this.d;
-            this.c.add(iasyncchunksaver);
-        }
+        // Akarin start
+        //if (!this.c.contains(iasyncchunksaver)) {
+        //    ++this.d;
+        //    this.c.add(iasyncchunksaver);
+        //}
+        executor.execute(() -> writeChunk(iasyncchunksaver));
+        // Akarin end
     }
 
     public void b() throws InterruptedException {
@@ -78,6 +98,8 @@ public class FileIOThread implements Runnable {
         while(!this.getThreadedIOQueue().isEmpty()) { // Paper - check actual list size
             Thread.sleep(10L);
         }
+        executor.shutdown(); // Akarin
+        executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); // Akarin
 
         this.f = false;
     }