From a161d480b48b25007769c73859b41b8af962fb79 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:55:07 -0400 Subject: [PATCH] Remove Debug checks from DataBits These are super hot and causing noticeable hits Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png --- .../Remove-Debug-checks-from-DataBits.patch | 44 +++++++++++++++++++ .../Use-Optimized-Collections.patch | 7 +-- scripts/importmcdev.sh | 1 + 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 Spigot-Server-Patches/Remove-Debug-checks-from-DataBits.patch diff --git a/Spigot-Server-Patches/Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/Remove-Debug-checks-from-DataBits.patch new file mode 100644 index 0000000000..3e722c92a0 --- /dev/null +++ b/Spigot-Server-Patches/Remove-Debug-checks-from-DataBits.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Tue, 5 Apr 2016 21:38:58 -0400 +Subject: [PATCH] Remove Debug checks from DataBits + +These are super hot and causing noticeable hits + +Before: http://i.imgur.com/nQsMzAE.png +After: http://i.imgur.com/nJ46crB.png + +diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/DataBits.java ++++ b/src/main/java/net/minecraft/server/DataBits.java +@@ -0,0 +0,0 @@ public class DataBits { + private final int d; + + public DataBits(int i, int j) { +- Validate.inclusiveBetween(1L, 32L, (long) i); ++ //Validate.inclusiveBetween(1L, 32L, (long) i); // Paper + this.d = j; + this.b = i; + this.c = (1L << i) - 1L; +@@ -0,0 +0,0 @@ public class DataBits { + } + + public void a(int i, int j) { +- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); +- Validate.inclusiveBetween(0L, this.c, (long) j); ++ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper ++ //Validate.inclusiveBetween(0L, this.c, (long) j); // Paper + int k = i * this.b; + int l = k / 64; + int i1 = ((i + 1) * this.b - 1) / 64; +@@ -0,0 +0,0 @@ public class DataBits { + } + + public int a(int i) { +- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); ++ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper + int j = i * this.b; + int k = j / 64; + int l = ((i + 1) * this.b - 1) / 64; +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Use-Optimized-Collections.patch b/Spigot-Server-Patches/Use-Optimized-Collections.patch index c912aa9066..77907bb532 100644 --- a/Spigot-Server-Patches/Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/Use-Optimized-Collections.patch @@ -1,9 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 -Subject: [PATCH] Use Optimized Collections For DataWatcher, swap out plain - Integer key HashMap for a Int2ObjectOpenHashMap For ChunkProviderServer, swap - out CraftBukkit LongObjectHashMap with Long2ObjectOpenHashMap +Subject: [PATCH] Use Optimized Collections + +Swap out CraftBukkit LongObjectHashMap with Long2ObjectOpenHashMap +Swap out Integer key HashMap for a Int2ObjectOpenHashMap For ChunkProviderServer Amaranth, the creator of LongObjectHashMap, tested it vs fastutil and determined fastutil to be 3x faster and could not create anything faster than fastutil. diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 2017398c24..638a7e70c7 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -47,6 +47,7 @@ import ChunkProviderHell import CommandAbstract import CommandScoreboard import CommandWhitelist +import DataBits import DataConverterMaterialId import EULA import EntitySquid