OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 20:50:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improvements to Timings concurrency and lookup performance

Browse source 
ConcurrentHashMap synchronizes on .computeIfAbsent even on hits,
so this does a .get(key) first, which most of our use should
be hits, and then falls back to the CHM computeIfAbsent for thread safe puts.

Also improve concurrency on handler and group collections to use a synchronized
list instead of an array deque for concurrency safety.
This commit is contained in:
Aikar 2019-02-23 14:22:43 -05:00
parent 7ab257e4f1
commit d1b6d22eac
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 55 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
Spigot-API-Patches/0004-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 3bb80307cfe675a18922158a1d2b1427e334a27b Mon Sep 17 00:00:00 2001 From 2853582c3382e794163a9c8a02e139eac9a8ea8e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600 Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -662,7 +662,7 @@ index 00000000..521c985e
+} +}
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
new file mode 100644 new file mode 100644
index 00000000..28d0954a index 00000000..e08a25f5
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +1,345 @@ @@ -0,0 +1,345 @@
@ -692,9 +692,7 @@ index 00000000..28d0954a
+package co.aikar.timings; +package co.aikar.timings;
+ +
+import co.aikar.timings.TimingHistory.RegionData.RegionId; +import co.aikar.timings.TimingHistory.RegionData.RegionId;
+import co.aikar.util.JSONUtil;
+import com.google.common.base.Function; +import com.google.common.base.Function;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets; +import com.google.common.collect.Sets;
+import org.bukkit.Bukkit; +import org.bukkit.Bukkit;
+import org.bukkit.Chunk; +import org.bukkit.Chunk;
@ -759,11 +757,13 @@ index 00000000..28d0954a
+ } + }
+ this.totalTicks = ticks; + this.totalTicks = ticks;
+ this.totalTime = FULL_SERVER_TICK.record.getTotalTime(); + this.totalTime = FULL_SERVER_TICK.record.getTotalTime();
+ this.entries = new TimingHistoryEntry[TimingsManager.HANDLERS.size()]; + synchronized (TimingsManager.HANDLERS) {
+ this.entries = new TimingHistoryEntry[TimingsManager.HANDLERS.size()];
+ +
+ int i = 0; + int i = 0;
+ for (TimingHandler handler : TimingsManager.HANDLERS) { + for (TimingHandler handler : TimingsManager.HANDLERS) {
+ entries[i++] = new TimingHistoryEntry(handler); + entries[i++] = new TimingHistoryEntry(handler);
+ }
+ } + }
+ +
+ +
@ -1074,10 +1074,10 @@ index 00000000..0e114eb3
+} +}
diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
new file mode 100644 new file mode 100644
index 00000000..a7f1f44d index 00000000..d3258a09
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingIdentifier.java +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +1,106 @@ @@ -0,0 +1,107 @@
+/* +/*
+ * This file is licensed under the MIT License (MIT). + * This file is licensed under the MIT License (MIT).
+ * + *
@ -1104,9 +1104,10 @@ index 00000000..a7f1f44d
+package co.aikar.timings; +package co.aikar.timings;
+ +
+import co.aikar.util.LoadingMap; +import co.aikar.util.LoadingMap;
+import co.aikar.util.MRUMapCache;
+ +
+import java.util.ArrayDeque; +import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map; +import java.util.Map;
+import java.util.Objects; +import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap;
@ -1164,7 +1165,7 @@ index 00000000..a7f1f44d
+ final int id = idPool.getAndIncrement(); + final int id = idPool.getAndIncrement();
+ +
+ final String name; + final String name;
+ ArrayDeque<TimingHandler> handlers = new ArrayDeque<TimingHandler>(64); + final List<TimingHandler> handlers = Collections.synchronizedList(new ArrayList<>(64));
+ +
+ private TimingGroup(String name) { + private TimingGroup(String name) {
+ this.name = name; + this.name = name;
@ -1601,10 +1602,10 @@ index 00000000..56b10e89
+} +}
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
new file mode 100644 new file mode 100644
index 00000000..df7f4259 index 00000000..4a69074a
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +1,342 @@ @@ -0,0 +1,350 @@
+/* +/*
+ * This file is licensed under the MIT License (MIT). + * This file is licensed under the MIT License (MIT).
+ * + *
@ -1760,21 +1761,29 @@ index 00000000..df7f4259
+ +
+ +
+ Map handlers = createObject(); + Map handlers = createObject();
+ for (TimingIdentifier.TimingGroup group : TimingIdentifier.GROUP_MAP.values()) { + Map groupData;
+ for (TimingHandler id : group.handlers) { + synchronized (TimingIdentifier.GROUP_MAP) {
+ if (!id.isTimed() && !id.isSpecial()) { + for (TimingIdentifier.TimingGroup group : TimingIdentifier.GROUP_MAP.values()) {
+ continue; + synchronized (group.handlers) {
+ for (TimingHandler id : group.handlers) {
+
+ if (!id.isTimed() && !id.isSpecial()) {
+ continue;
+ }
+ handlers.put(id.id, toArray(
+ group.id,
+ id.name
+ ));
+ }
+ } + }
+ handlers.put(id.id, toArray(
+ group.id,
+ id.name
+ ));
+ } + }
+
+ groupData = toObjectMapper(
+ TimingIdentifier.GROUP_MAP.values(), group -> pair(group.id, group.name));
+ } + }
+ +
+ parent.put("idmap", createObject( + parent.put("idmap", createObject(
+ pair("groups", toObjectMapper( + pair("groups", groupData),
+ TimingIdentifier.GROUP_MAP.values(), group -> pair(group.id, group.name))),
+ pair("handlers", handlers), + pair("handlers", handlers),
+ pair("worlds", toObjectMapper(TimingHistory.worldMap.entrySet(), input -> pair(input.getValue(), input.getKey()))), + pair("worlds", toObjectMapper(TimingHistory.worldMap.entrySet(), input -> pair(input.getValue(), input.getKey()))),
+ pair("tileentity", + pair("tileentity",
@ -1949,10 +1958,10 @@ index 00000000..df7f4259
+} +}
diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
new file mode 100644 new file mode 100644
index 00000000..f63e7033 index 00000000..127651ff
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsManager.java +++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,187 @@ @@ -0,0 +1,189 @@
+/* +/*
+ * This file is licensed under the MIT License (MIT). + * This file is licensed under the MIT License (MIT).
+ * + *
@ -1978,18 +1987,16 @@ index 00000000..f63e7033
+ */ + */
+package co.aikar.timings; +package co.aikar.timings;
+ +
+import co.aikar.util.LoadingMap;
+import com.google.common.collect.EvictingQueue; +import com.google.common.collect.EvictingQueue;
+import org.bukkit.Bukkit; +import org.bukkit.Bukkit;
+import org.bukkit.Server; +import org.bukkit.Server;
+import org.bukkit.command.Command; +import org.bukkit.command.Command;
+import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.PluginClassLoader; +import org.bukkit.plugin.java.PluginClassLoader;
+import co.aikar.util.LoadingMap;
+ +
+import javax.annotation.Nullable; +import javax.annotation.Nullable;
+import java.util.ArrayDeque;
+import java.util.ArrayList; +import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections; +import java.util.Collections;
+import java.util.List; +import java.util.List;
+import java.util.Map; +import java.util.Map;
@ -2006,7 +2013,7 @@ index 00000000..f63e7033
+ public static List<String> hiddenConfigs = new ArrayList<String>(); + public static List<String> hiddenConfigs = new ArrayList<String>();
+ public static boolean privacy = false; + public static boolean privacy = false;
+ +
+ static final List<TimingHandler> HANDLERS = new ArrayList<>(1024); + static final List<TimingHandler> HANDLERS = Collections.synchronizedList(new ArrayList<>(1024));
+ static final List<TimingHistory.MinuteReport> MINUTE_REPORTS = new ArrayList<>(64); + static final List<TimingHistory.MinuteReport> MINUTE_REPORTS = new ArrayList<>(64);
+ +
+ static EvictingQueue<TimingHistory> HISTORY = EvictingQueue.create(12); + static EvictingQueue<TimingHistory> HISTORY = EvictingQueue.create(12);
@ -2033,12 +2040,14 @@ index 00000000..f63e7033
+ if (Timings.timingsEnabled) { + if (Timings.timingsEnabled) {
+ boolean violated = FULL_SERVER_TICK.isViolated(); + boolean violated = FULL_SERVER_TICK.isViolated();
+ +
+ for (TimingHandler handler : HANDLERS) { + synchronized (HANDLERS) {
+ if (handler.isSpecial()) { + for (TimingHandler handler : HANDLERS) {
+ // We manually call this + if (handler.isSpecial()) {
+ continue; + // We manually call this
+ continue;
+ }
+ handler.processTick(violated);
+ } + }
+ handler.processTick(violated);
+ } + }
+ +
+ TimingHistory.playerTicks += Bukkit.getOnlinePlayers().size(); + TimingHistory.playerTicks += Bukkit.getOnlinePlayers().size();
@ -2075,8 +2084,10 @@ index 00000000..f63e7033
+ } else { + } else {
+ // Soft resets only need to act on timings that have done something + // Soft resets only need to act on timings that have done something
+ // Handlers can only be modified on main thread. + // Handlers can only be modified on main thread.
+ for (TimingHandler timings : HANDLERS) { + synchronized (HANDLERS) {
+ timings.reset(false); + for (TimingHandler timings : HANDLERS) {
+ timings.reset(false);
+ }
+ } + }
+ } + }
+ +
@ -2530,10 +2541,10 @@ index 00000000..24eae4be
+} +}
diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
new file mode 100644 new file mode 100644
index 00000000..9a4f9dca index 00000000..dfefda35
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingMap.java +++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,339 @@ @@ -0,0 +1,343 @@
+/* +/*
+ * This file is licensed under the MIT License (MIT). + * This file is licensed under the MIT License (MIT).
+ * + *
@ -2787,6 +2798,10 @@ index 00000000..9a4f9dca
+ +
+ @Override + @Override
+ public V get(Object key) { + public V get(Object key) {
+ V v = backingMap.get(key);
+ if (v != null) {
+ return v;
+ }
+ return backingMap.computeIfAbsent((K) key, loader); + return backingMap.computeIfAbsent((K) key, loader);
+ } + }
+ +