Altitude/VillagerShopUI
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed concurrency issues with user map

Browse Source
This commit is contained in:
Teriuihi 2022-08-28 21:37:30 +02:00
parent e1a059feab
commit 3ec0e30f57
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/alttd/objects/EconUser.java
View File

@ -8,17 +8,18 @@ import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.Unmodifiable; import org.jetbrains.annotations.Unmodifiable;
import java.io.ByteArrayOutputStream;
import java.util.*; import java.util.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class EconUser { public class EconUser {
private final static Object2ObjectArrayMap<UUID, EconUser> users = new Object2ObjectArrayMap<>(); private static Object2ObjectArrayMap<UUID, EconUser> users = new Object2ObjectArrayMap<>();
private final static Queue<EconUser> addQueue = new LinkedBlockingQueue<>();
private final static Queue<EconUser> removeQueue = new LinkedBlockingQueue<>();
private final UUID uuid; private final UUID uuid;
private final Object2ObjectArrayMap<String, Integer> pointsMap; private final Object2ObjectArrayMap<String, Integer> pointsMap;
@ -26,7 +27,8 @@ public class EconUser {
public EconUser(UUID uuid, Object2ObjectArrayMap<String, Integer> points) { public EconUser(UUID uuid, Object2ObjectArrayMap<String, Integer> points) {
this.uuid = uuid; this.uuid = uuid;
this.pointsMap = points; this.pointsMap = points;
users.put(this.uuid, this); addQueue.offer(this);
updateUsers();
if (Config.DEBUG) if (Config.DEBUG)
Logger.info("Created EconUser for: %", uuid.toString()); Logger.info("Created EconUser for: %", uuid.toString());
} }
@ -137,7 +139,30 @@ public class EconUser {
queriedUsers.remove(uuid); queriedUsers.remove(uuid);
if (Config.DEBUG) if (Config.DEBUG)
Logger.info("Unloading EconUser %", uuid.toString()); Logger.info("Unloading EconUser %", uuid.toString());
users.remove(uuid); EconUser user = users.get(uuid);
if (user == null)
return;
removeQueue.offer(user);
updateUsers();
}
private static void updateUsers() {
if (addQueue.isEmpty() && removeQueue.isEmpty())
return;
Object2ObjectArrayMap<UUID, EconUser> tmp = new Object2ObjectArrayMap<>(users);
while (!addQueue.isEmpty()) {
EconUser user = addQueue.poll();
if (user == null)
continue;
tmp.put(user.getUuid(), user);
}
while (!removeQueue.isEmpty()) {
EconUser user = addQueue.poll();
if (user == null)
continue;
tmp.remove(user.getUuid());
}
users = tmp;
} }
@Unmodifiable @Unmodifiable