Paper/patches/server/0094-Optimize-UserCache-Thread-Safe.patch

112 lines
4.9 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
Subject: [PATCH] Optimize UserCache / Thread Safe
Because Techable keeps complaining about how this isn't thread safe,
easier to do this than replace the entire thing.
Additionally, move Saving of the User cache to be done async, incase
the user never changed the default setting for Spigot's save on stop only.
2021-06-12 07:20:08 +02:00
1.17: TODO does this need the synchronized blocks anymore?
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
index 7cabb48a2b82fd0ce1522d5fbca6841613159329..6f46c66890429e438c484e3a5f425936bd7d4130 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
@@ -987,7 +987,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();
2021-06-12 07:20:08 +02:00
+ this.getProfileCache().save(false); // Paper
2021-06-11 14:02:28 +02:00
}
// Spigot end
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2021-07-07 08:52:40 +02:00
index bd94277862e0f5546b4df81fbd535d2e4c7ef5b1..7d834c1b1588851188372eebd9efad9313c610f7 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
2021-07-07 08:52:40 +02:00
@@ -257,7 +257,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
2021-06-11 14:02:28 +02:00
}
if (this.convertOldUsers()) {
- this.getProfileCache().save();
2021-06-12 07:20:08 +02:00
+ this.getProfileCache().save(false); // Paper
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
2021-07-07 08:52:40 +02:00
index 769f2a595f8ca6030c17d5472ee1773063ebe52c..548627b5a12e79ac31136b2695e45f9452115348 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
2021-07-07 08:52:40 +02:00
@@ -118,7 +118,7 @@ public class GameProfileCache {
2021-06-11 14:02:28 +02:00
return GameProfileCache.usesAuthentication;
}
2021-06-12 07:20:08 +02:00
- public void add(GameProfile profile) {
+ public synchronized void add(GameProfile profile) { // Paper - synchronize
2021-06-11 14:02:28 +02:00
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
2021-07-07 08:52:40 +02:00
@@ -127,14 +127,14 @@ 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
2021-06-12 07:20:08 +02:00
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(true); // Spigot - skip saving if disabled // Paper - async
2021-06-11 14:02:28 +02:00
}
private long getNextOperation() {
2021-07-07 08:52:40 +02:00
return this.operationCount.incrementAndGet();
2021-06-11 14:02:28 +02:00
}
2021-07-07 08:52:40 +02:00
- public Optional<GameProfile> get(String name) {
+ public synchronized Optional<GameProfile> get(String name) { // Paper - synchronize
String s1 = name.toLowerCase(Locale.ROOT);
2021-06-11 14:02:28 +02:00
GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
boolean flag = false;
2021-06-12 07:20:08 +02:00
@@ -160,7 +160,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();
2021-06-12 07:20:08 +02:00
+ this.save(true); // Paper
2021-06-11 14:02:28 +02:00
}
2021-07-07 08:52:40 +02:00
return optional;
@@ -270,7 +270,7 @@ public class GameProfileCache {
2021-06-11 14:02:28 +02:00
return arraylist;
}
- public void save() {
2021-06-12 07:20:08 +02:00
+ public void save(boolean asyncSave) { // Paper
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
2021-07-07 08:52:40 +02:00
@@ -278,6 +278,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
try {
BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
2021-07-07 08:52:40 +02:00
@@ -302,7 +303,14 @@ public class GameProfileCache {
2021-06-11 14:02:28 +02:00
} catch (IOException ioexception) {
;
}
2021-07-07 08:52:40 +02:00
-
2021-06-11 14:02:28 +02:00
+ // Paper start
+ };
+ if (asyncSave) {
2021-06-12 07:20:08 +02:00
+ net.minecraft.server.MCUtil.scheduleAsyncTask(save);
2021-06-11 14:02:28 +02:00
+ } else {
+ save.run();
+ }
+ // Paper end
}
2021-07-07 08:52:40 +02:00
private Stream<GameProfileCache.GameProfileInfo> getTopMRUProfiles(int limit) {