OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve synchronization on ExpiringMap

Browse source
This commit is contained in:
Aikar 2018-09-21 21:43:50 -04:00
parent 6483b1a44f
commit 6fa6b67f02
1 changed files with 68 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch
View file

@ -14,7 +14,7 @@ manipulation, and instead to run clean
once per tick per active expiring map. once per tick per active expiring map.
diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java
index 4006f5a69c..9a3b35ea1a 100644 index 4006f5a69c..127de5c8df 100644
--- a/src/main/java/net/minecraft/server/ExpiringMap.java --- a/src/main/java/net/minecraft/server/ExpiringMap.java
+++ b/src/main/java/net/minecraft/server/ExpiringMap.java +++ b/src/main/java/net/minecraft/server/ExpiringMap.java
@@ -0,0 +0,0 @@ package net.minecraft.server; @@ -0,0 +0,0 @@ package net.minecraft.server;
@ -42,21 +42,32 @@ index 4006f5a69c..9a3b35ea1a 100644
this.a = j; this.a = j;
} }
- private void a(long i) { + // Paper start
+ private void setAccess(long i) { a(i); } // Paper - OBFHELPER
private void a(long i) {
- long j = SystemUtils.b(); - long j = SystemUtils.b();
- this.b.put(i, j); - this.b.put(i, j);
- ObjectIterator objectiterator = this.b.long2LongEntrySet().iterator(); - ObjectIterator objectiterator = this.b.long2LongEntrySet().iterator();
+ // Paper start -
+ private synchronized void setAccess(long i) { a(i); } // Paper - OBFHELPER - while(objectiterator.hasNext()) {
+ private synchronized void a(long i) { - Entry entry = (Entry)objectiterator.next();
+ long j = System.currentTimeMillis(); // Paper - Object object = super.get(entry.getLongKey());
+ this.ttl.put(i, j); - if (j - entry.getLongValue() <= (long)this.a) {
+ if (!registered) { - break;
+ registered = true; + synchronized (this.sync) {
+ MinecraftServer.getServer().expiringMaps.add(this); + long j = System.currentTimeMillis(); // Paper
+ this.ttl.put(i, j);
+ if (!registered) {
+ registered = true;
+ MinecraftServer.getServer().expiringMaps.add(this);
}
+ } + }
+ } + }
+
- if (object != null && this.a(object)) {
- super.remove(entry.getLongKey());
- objectiterator.remove();
- }
+ @Override + @Override
+ public T compute(long l, BiFunction<? super Long, ? super T, ? extends T> biFunction) { + public T compute(long l, BiFunction<? super Long, ? super T, ? extends T> biFunction) {
+ setAccess(l); + setAccess(l);
@ -130,56 +141,59 @@ index 4006f5a69c..9a3b35ea1a 100644
+ } + }
+ +
+ @Override + @Override
+ public synchronized void clear() { + public void clear() {
+ ttl.clear(); + synchronized (this.sync) {
+ super.clear(); + ttl.clear();
+ super.clear();
}
+ } + }
+
+ private boolean registered = false; + private boolean registered = false;
+ private boolean hasLeaked = false; + private boolean hasLeaked = false;
+ +
+ // Break clean to its own method to be ticked + // Break clean to its own method to be ticked
+ synchronized boolean clean() { + boolean clean() {
+ long now = System.currentTimeMillis(); + synchronized (this.sync) {
+ ObjectIterator<Long2LongMap.Entry> objectiterator = this.ttl.long2LongEntrySet().iterator(); // Paper + long now = System.currentTimeMillis();
+ ObjectIterator<Long2LongMap.Entry> objectiterator = this.ttl.long2LongEntrySet().iterator(); // Paper
while(objectiterator.hasNext()) { +
- Entry entry = (Entry)objectiterator.next(); + while (objectiterator.hasNext()) {
- Object object = super.get(entry.getLongKey()); + Long2LongMap.Entry entry = objectiterator.next(); // Paper
- if (j - entry.getLongValue() <= (long)this.a) { + T object = super.get(entry.getLongKey()); // Paper
+ Long2LongMap.Entry entry = objectiterator.next(); // Paper + if (now - entry.getLongValue() <= (long) this.a) {
+ T object = super.get(entry.getLongKey()); // Paper + break;
+ if (now - entry.getLongValue() <= (long)this.a) {
break;
}
@@ -0,0 +0,0 @@ public class ExpiringMap<T> extends Long2ObjectOpenHashMap<T> {
objectiterator.remove();
}
}
-
+ int ttlSize = this.ttl.size();
+ int thisSize = this.size();
+ if (ttlSize < thisSize) {
+ if (!hasLeaked) { // log once
+ hasLeaked = true;
+ MinecraftServer.LOGGER.warn("WARNING: ExpiringMap desync (" + ttlSize + ":" + thisSize + ")- Memory leak risk! We will recover from this, but this means there is still a bug. Please do not open an issue about this. Mention it in Discord (we don't need everyone reporting the same thing)");
+ }
+ try {
+ for (Entry<T> entry : this.long2ObjectEntrySet()) {
+ ttl.putIfAbsent(entry.getLongKey(), now);
+ } + }
+ } catch (Exception e) { } // Ignore any como's +
+ } else if (ttlSize > this.size()) { + if (object != null && this.a(object)) {
+ try { + super.remove(entry.getLongKey());
+ this.ttl.long2LongEntrySet().removeIf(entry -> !this.containsKey(entry.getLongKey())); + objectiterator.remove();
+ } catch (Exception e) { } // Ignore any como's + }
+ }
+ int ttlSize = this.ttl.size();
+ int thisSize = this.size();
+ if (ttlSize < thisSize) {
+ if (!hasLeaked) { // log once
+ hasLeaked = true;
+ MinecraftServer.LOGGER.warn("WARNING: ExpiringMap desync (" + ttlSize + ":" + thisSize + ")- Memory leak risk! We will recover from this, but this means there is still a bug. Please do not open an issue about this. Mention it in Discord (we don't need everyone reporting the same thing)");
+ }
+ try {
+ for (Entry<T> entry : this.long2ObjectEntrySet()) {
+ ttl.putIfAbsent(entry.getLongKey(), now);
+ }
+ } catch (Exception e) {
+ } // Ignore any como's
+ } else if (ttlSize > this.size()) {
+ try {
+ this.ttl.long2LongEntrySet().removeIf(entry -> !this.containsKey(entry.getLongKey()));
+ } catch (Exception e) {
+ } // Ignore any como's
+ }
+ if (isEmpty()) {
+ registered = false;
+ return true;
+ }
+ return false;
+ } + }
+ if (isEmpty()) {
+ registered = false;
+ return true;
+ }
+ return false;
+ // Paper end + // Paper end
} }