Paper/patches/server/0104-Async-GameProfileCache-saving.patch

87 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 20:47:41 -0400
2022-03-18 04:53:36 +01:00
Subject: [PATCH] Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
2021-06-12 07:20:08 +02:00
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2024-04-24 03:25:14 +02:00
index ae4a8cb0fb3e36710fedd9a71d0e0efdf0895015..1ecd28b709e3ef47568298878a84a6aede52d6f5 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2024-04-24 03:25:14 +02:00
@@ -995,7 +995,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2021-06-11 14:02:28 +02:00
} catch (java.lang.InterruptedException ignored) {} // Paper
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
2021-06-12 07:20:08 +02:00
MinecraftServer.LOGGER.info("Saving usercache.json");
2021-06-11 14:02:28 +02:00
- this.getProfileCache().save();
+ this.getProfileCache().save(false); // Paper - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
}
// Spigot end
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2024-04-24 03:25:14 +02:00
index a6126515e497cb0769bdc96881389026196bbbae..2caebd76cd533cf6874b6461b496e76e8ec85d61 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2024-04-24 03:25:14 +02:00
@@ -266,7 +266,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
2021-06-11 14:02:28 +02:00
}
if (this.convertOldUsers()) {
- this.getProfileCache().save();
+ this.getProfileCache().save(false); // Paper - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
}
if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
2024-04-24 03:25:14 +02:00
index f6e290bf4480da51512f8a166459687dad1f6a07..5b219b5eee0c5958b80093c9223feeed0dec830b 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
@@ -117,7 +117,7 @@ public class GameProfileCache {
2021-06-12 07:20:08 +02:00
GameProfileCache.GameProfileInfo usercache_usercacheentry = new GameProfileCache.GameProfileInfo(profile, date);
2021-06-11 14:02:28 +02:00
this.safeAdd(usercache_usercacheentry);
- if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(); // Spigot - skip saving if disabled
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(true); // Spigot - skip saving if disabled // Paper - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
}
private long getNextOperation() {
@@ -150,7 +150,7 @@ public class GameProfileCache {
2021-06-11 14:02:28 +02:00
}
if (flag && !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { // Spigot - skip saving if disabled
- this.save();
+ this.save(true); // Paper - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
}
2021-07-07 08:52:40 +02:00
return optional;
@@ -262,7 +262,7 @@ public class GameProfileCache {
2024-04-24 03:25:14 +02:00
return list;
2021-06-11 14:02:28 +02:00
}
- public void save() {
+ public void save(boolean asyncSave) { // Paper - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
JsonArray jsonarray = new JsonArray();
2021-06-12 07:20:08 +02:00
DateFormat dateformat = GameProfileCache.createDateFormat();
2021-06-11 14:02:28 +02:00
@@ -270,6 +270,7 @@ public class GameProfileCache {
2021-06-12 07:20:08 +02:00
jsonarray.add(GameProfileCache.writeGameProfile(usercache_usercacheentry, dateformat));
2021-06-11 14:02:28 +02:00
});
String s = this.gson.toJson(jsonarray);
+ Runnable save = () -> { // Paper - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
try {
BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
@@ -294,6 +295,14 @@ public class GameProfileCache {
2021-06-11 14:02:28 +02:00
} catch (IOException ioexception) {
;
}
+ // Paper start - Perf: Async GameProfileCache saving
2021-06-11 14:02:28 +02:00
+ };
+ if (asyncSave) {
+ io.papermc.paper.util.MCUtil.scheduleAsyncTask(save);
2021-06-11 14:02:28 +02:00
+ } else {
+ save.run();
+ }
+ // Paper end - Perf: Async GameProfileCache saving
2022-03-18 04:53:36 +01:00
2021-06-11 14:02:28 +02:00
}