SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily remove synchronization from UserCache optimizations

Browse Source 
In regards to GH-301
This commit is contained in:
Zach Brown
2016-05-22 21:07:40 -05:00
parent 5f6f6c6321
commit 87366c4f4d
1 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Spigot-Server-Patches/Optimize-UserCache-Thread-Safe.patch
View File

@@ -26,15 +26,6 @@ diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/n
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/UserCache.java --- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -0,0 +0,0 @@ public class UserCache {
this.a(gameprofile, (Date) null);
}
- private void a(GameProfile gameprofile, Date date) {
+ private synchronized void a(GameProfile gameprofile, Date date) { // Paper - synchronize
UUID uuid = gameprofile.getId();
if (date == null) {
@@ -0,0 +0,0 @@ public class UserCache { @@ -0,0 +0,0 @@ public class UserCache {
String s = gameprofile.getName().toLowerCase(Locale.ROOT); String s = gameprofile.getName().toLowerCase(Locale.ROOT);
UserCache.UserCacheEntry usercache_usercacheentry = new UserCache.UserCacheEntry(gameprofile, date, null); UserCache.UserCacheEntry usercache_usercacheentry = new UserCache.UserCacheEntry(gameprofile, date, null);
@@ -47,24 +38,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.d.remove(usercache_usercacheentry1.a().getName().toLowerCase(Locale.ROOT)); this.d.remove(usercache_usercacheentry1.a().getName().toLowerCase(Locale.ROOT));
this.f.remove(gameprofile); this.f.remove(gameprofile);
@@ -0,0 +0,0 @@ public class UserCache { @@ -0,0 +0,0 @@ public class UserCache {
}
@Nullable
- public GameProfile getProfile(String s) {
+ public synchronized GameProfile getProfile(String s) { // Paper - synchronize
String s1 = s.toLowerCase(Locale.ROOT);
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.d.get(s1);
@@ -0,0 +0,0 @@ public class UserCache {
return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
}
- public String[] a() {
+ public synchronized String[] a() { // Paper - synchronize
ArrayList arraylist = Lists.newArrayList(this.d.keySet());
return (String[]) arraylist.toArray(new String[arraylist.size()]);
@@ -0,0 +0,0 @@ public class UserCache {
} }
@@ -75,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public void c(boolean asyncSave) { + public void c(boolean asyncSave) {
+ // Paper end + // Paper end
String s = this.b.toJson(this.a(org.spigotmc.SpigotConfig.userCacheCap)); String s = this.b.toJson(this.a(org.spigotmc.SpigotConfig.userCacheCap));
+ Runnable save = () -> { synchronized (this.h) { // Paper - ensure only 1 file is writing at same time by syncing to the FD + Runnable save = () -> { // Paper - ensure only 1 file is writing at same time by syncing to the FD // ¯\_(ツ)_/¯
+ +
BufferedWriter bufferedwriter = null; BufferedWriter bufferedwriter = null;
@@ -85,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
IOUtils.closeQuietly(bufferedwriter); IOUtils.closeQuietly(bufferedwriter);
} }
+ // Paper start + // Paper start
+ }}; + };
+ if (asyncSave) { + if (asyncSave) {
+ MCUtil.scheduleAsyncTask(save); + MCUtil.scheduleAsyncTask(save);
+ } else { + } else {