Paper/CraftBukkit-Patches/0158-Use-CLQ-for-main-thread-tasks.patch

57 lines
2.2 KiB
Diff

From 24bbbf4ff02ee0450297e8aed42e225bc2c1b532 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 19 Apr 2015 09:19:39 +1000
Subject: [PATCH] Use CLQ for main thread tasks.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 88640a5..b189c19 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -104,7 +104,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
private long X = 0L;
private final GameProfileRepository Y;
private final UserCache Z;
- protected final Queue<FutureTask<?>> j = Queues.newArrayDeque();
+ protected final Queue<FutureTask<?>> j = new java.util.concurrent.ConcurrentLinkedQueue<FutureTask<?>>(); // Spigot, PAIL: Rename
private Thread serverThread;
private long ab = ay();
@@ -705,11 +705,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.a("jobs");
Queue queue = this.j;
- synchronized (this.j) {
- while (!this.j.isEmpty()) {
- SystemUtils.a((FutureTask) this.j.poll(), MinecraftServer.LOGGER);
- }
- }
+ // Spigot start
+ FutureTask<?> entry;
+ int count = this.j.size();
+ while (count-- > 0 && (entry = this.j.poll()) != null) {
+ SystemUtils.a(entry, MinecraftServer.LOGGER);
+ }
+ // Spigot end
this.methodProfiler.c("levels");
@@ -1493,10 +1495,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callable);
Queue queue = this.j;
- synchronized (this.j) {
- this.j.add(listenablefuturetask);
- return listenablefuturetask;
- }
+ // Spigot start
+ this.j.add(listenablefuturetask);
+ return listenablefuturetask;
+ // Spigot end
} else {
try {
return Futures.immediateFuture(callable.call());
--
2.1.0