Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 07:28:19 +01:00
Code Issues Projects Releases Wiki Activity

Add IndexMap

Browse Source
This commit is contained in:
themode 2022-03-23 08:49:40 +01:00
parent d20cf85982
commit dc9580b990
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/minestom/server/tag/Tag.java
View File

@ -1,7 +1,7 @@
package net.minestom.server.tag;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import net.minestom.server.item.ItemStack;
import net.minestom.server.utils.collection.IndexMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@ -21,12 +21,7 @@ import java.util.function.Supplier;
*/
@ApiStatus.NonExtendable
public class Tag<T> {
private static final Object2IntOpenHashMap<String> INDEX_MAP = new Object2IntOpenHashMap<>();
private static int lastIndex = 0; // Synchronized on INDEX_MAP
static {
INDEX_MAP.defaultReturnValue(-1);
}
private static final IndexMap<String> INDEX_MAP = new IndexMap<>();
private final String key;
final Function<NBT, T> readFunction;
@ -43,21 +38,7 @@ public class Tag<T> {
this.readFunction = readFunction;
this.writeFunction = writeFunction;
this.defaultValue = defaultValue;
// Potentially very hot code!
// First try to get the index from the cpu cache
// If it's not there, synchronization is required
int index = INDEX_MAP.getInt(key);
if (index == -1) {
synchronized (INDEX_MAP) {
index = INDEX_MAP.getInt(key);
if (index == -1) {
index = lastIndex++;
INDEX_MAP.put(key, index);
}
}
}
this.index = index;
this.index = INDEX_MAP.get(key);
}
static <T, N extends NBT> Tag<T> tag(@NotNull String key,

30
src/main/java/net/minestom/server/utils/collection/IndexMap.java Normal file
View File

@ -0,0 +1,30 @@
package net.minestom.server.utils.collection;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@ApiStatus.Internal
public final class IndexMap<T> {
private final Object2IntOpenHashMap<T> indexMap;
private int lastIndex = 0; // Synchronized on INDEX_MAP
public IndexMap() {
this.indexMap = new Object2IntOpenHashMap<>();
indexMap.defaultReturnValue(-1);
}
public int get(@NotNull T key) {
int index = indexMap.getInt(key);
if (index == -1) {
synchronized (indexMap) {
index = indexMap.getInt(key);
if (index == -1) {
index = lastIndex++;
indexMap.put(key, index);
}
}
}
return index;
}
}