Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed CME in forcefield registry

Browse source 
Added usage stats to forcefield registry logs
This commit is contained in:
LemADEC 2017-01-04 00:14:25 +01:00
parent 31785f7f97
commit 2e37a94884
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/cr0s/warpdrive/data/ForceFieldRegistry.java
View file

@ -7,7 +7,13 @@ import cr0s.warpdrive.config.WarpDriveConfig;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.WorldServer; import net.minecraft.world.WorldServer;
import java.util.*;
import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
/** /**
* Registry of all known forcefield in the loaded worlds, grouped by frequency * Registry of all known forcefield in the loaded worlds, grouped by frequency
@ -15,13 +21,21 @@ import java.util.*;
* @author LemADEC * @author LemADEC
*/ */
public class ForceFieldRegistry { public class ForceFieldRegistry {
private static final int FORCE_FIELD_REGISTRY_DEFAULT_ENTRIES_PER_FREQUENCY = 10; private static final HashMap<Integer, CopyOnWriteArraySet<GlobalPosition>> registry = new HashMap<>();
private static final HashMap<Integer, HashSet<GlobalPosition>> registry = new HashMap<>(); private static int countAdd = 0;
private static int countRemove = 0;
private static int countRead = 0;
public static Set<TileEntity> getTileEntities(final int beamFrequency, WorldServer worldSource, final int x, final int y, final int z) { public static Set<TileEntity> getTileEntities(final int beamFrequency, WorldServer worldSource, final int x, final int y, final int z) {
Set<GlobalPosition> setGlobalPositions = registry.get(beamFrequency); countRead++;
if (WarpDriveConfig.LOGGING_FORCEFIELD_REGISTRY) {
if (countRead % 1000 == 0) {
WarpDrive.logger.info("ForceFieldRegistry stats: read " + countRead + " add " + countAdd + " remove " + countRemove + " => " + ((float) countRead) / (countRemove + countRead + countAdd) + "% read");
}
}
CopyOnWriteArraySet<GlobalPosition> setGlobalPositions = registry.get(beamFrequency);
if (setGlobalPositions == null || worldSource == null) { if (setGlobalPositions == null || worldSource == null) {
return new HashSet<>(); return new CopyOnWriteArraySet<>();
} }
// find all relevant tiles by world and frequency, keep relays in range as starting point // find all relevant tiles by world and frequency, keep relays in range as starting point
Set<TileEntity> setNonRelays = new HashSet<>(); Set<TileEntity> setNonRelays = new HashSet<>();
@ -29,8 +43,7 @@ public class ForceFieldRegistry {
Set<TileEntity> setToIterate = new HashSet<>(); Set<TileEntity> setToIterate = new HashSet<>();
int range2; int range2;
int maxRange2 = ForceFieldSetup.FORCEFIELD_RELAY_RANGE * ForceFieldSetup.FORCEFIELD_RELAY_RANGE; int maxRange2 = ForceFieldSetup.FORCEFIELD_RELAY_RANGE * ForceFieldSetup.FORCEFIELD_RELAY_RANGE;
for (Iterator<GlobalPosition> iterator = setGlobalPositions.iterator(); iterator.hasNext();) { for (GlobalPosition globalPosition : setGlobalPositions) {
GlobalPosition globalPosition = iterator.next();
WorldServer world = globalPosition.getWorldServerIfLoaded(); WorldServer world = globalPosition.getWorldServerIfLoaded();
if (world != null) { if (world != null) {
// skip if it's in another dimension // skip if it's in another dimension
@ -56,7 +69,8 @@ public class ForceFieldRegistry {
} }
} }
// world isn't loaded or block no longer exist => remove from registry // world isn't loaded or block no longer exist => remove from registry
iterator.remove(); countRemove++;
setGlobalPositions.remove(globalPosition);
if (WarpDriveConfig.LOGGING_FORCEFIELD_REGISTRY) { if (WarpDriveConfig.LOGGING_FORCEFIELD_REGISTRY) {
printRegistry("removed"); printRegistry("removed");
} }
@ -111,9 +125,10 @@ public class ForceFieldRegistry {
public static void updateInRegistry(IBeamFrequency tileEntity) { public static void updateInRegistry(IBeamFrequency tileEntity) {
assert(tileEntity instanceof TileEntity); assert(tileEntity instanceof TileEntity);
HashSet<GlobalPosition> setGlobalPositions = registry.get(tileEntity.getBeamFrequency()); countRead++;
CopyOnWriteArraySet<GlobalPosition> setGlobalPositions = registry.get(tileEntity.getBeamFrequency());
if (setGlobalPositions == null) { if (setGlobalPositions == null) {
setGlobalPositions = new HashSet<>(FORCE_FIELD_REGISTRY_DEFAULT_ENTRIES_PER_FREQUENCY); setGlobalPositions = new CopyOnWriteArraySet<>();
} }
for (GlobalPosition globalPosition : setGlobalPositions) { for (GlobalPosition globalPosition : setGlobalPositions) {
if (globalPosition.equals(tileEntity)) { if (globalPosition.equals(tileEntity)) {
@ -122,6 +137,7 @@ public class ForceFieldRegistry {
} }
} }
// not found => add // not found => add
countAdd++;
setGlobalPositions.add(new GlobalPosition((TileEntity)tileEntity)); setGlobalPositions.add(new GlobalPosition((TileEntity)tileEntity));
registry.put(tileEntity.getBeamFrequency(), setGlobalPositions); registry.put(tileEntity.getBeamFrequency(), setGlobalPositions);
if (WarpDriveConfig.LOGGING_FORCEFIELD_REGISTRY) { if (WarpDriveConfig.LOGGING_FORCEFIELD_REGISTRY) {
@ -132,6 +148,7 @@ public class ForceFieldRegistry {
public static void removeFromRegistry(IBeamFrequency tileEntity) { public static void removeFromRegistry(IBeamFrequency tileEntity) {
assert(tileEntity instanceof TileEntity); assert(tileEntity instanceof TileEntity);
countRead++;
Set<GlobalPosition> setGlobalPositions = registry.get(tileEntity.getBeamFrequency()); Set<GlobalPosition> setGlobalPositions = registry.get(tileEntity.getBeamFrequency());
if (setGlobalPositions == null) { if (setGlobalPositions == null) {
// noting to remove // noting to remove
@ -141,6 +158,7 @@ public class ForceFieldRegistry {
GlobalPosition globalPosition = iterator.next(); GlobalPosition globalPosition = iterator.next();
if (globalPosition.equals(tileEntity)) { if (globalPosition.equals(tileEntity)) {
// found it, remove and exit // found it, remove and exit
countRemove++;
iterator.remove(); iterator.remove();
return; return;
} }
@ -151,7 +169,7 @@ public class ForceFieldRegistry {
public static void printRegistry(final String trigger) { public static void printRegistry(final String trigger) {
WarpDrive.logger.info("Forcefield registry (" + registry.size() + " entries after " + trigger + "):"); WarpDrive.logger.info("Forcefield registry (" + registry.size() + " entries after " + trigger + "):");
for (Map.Entry<Integer, HashSet<GlobalPosition>> entry : registry.entrySet()) { for (Map.Entry<Integer, CopyOnWriteArraySet<GlobalPosition>> entry : registry.entrySet()) {
String message = ""; String message = "";
for (GlobalPosition globalPosition : entry.getValue()) { for (GlobalPosition globalPosition : entry.getValue()) {
if (!message.isEmpty()) { if (!message.isEmpty()) {