mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 19:59:37 +00:00
Removed the old tick handler profiler and structure.
Tick handlers are now sent as Events and redirected to the right Swing tab.
This commit is contained in:
1 parent
a774131e36
commit
d8e699fd2a
21 files changed
+57
-312
No files matched your search
@@ -11,8 +11,8 @@ public enum ProfilerSection implements IProfilerBase{
|
||||
ENTITY_UPDATETIME (RunType.ONREQUEST, Side.SERVER), //Profiling of the entity tick time, per entity.
|
||||
TICK (RunType.REALTIME, Side.SERVER), //Tick timing profiling
|
||||
TILEENT_UPDATETIME (RunType.ONREQUEST, Side.SERVER), //Profiling of the TileEntity tick time, per TE.
|
||||
HANDLER_TICKSTART (RunType.ONREQUEST, EnumSet.of(Side.CLIENT, Side.SERVER)), //Server handler for ServerTick start.
|
||||
HANDLER_TICKSTOP (RunType.ONREQUEST, EnumSet.of(Side.CLIENT, Side.SERVER)), //Server handler for ServerTick stop.
|
||||
//HANDLER_TICKSTART (RunType.ONREQUEST, EnumSet.of(Side.CLIENT, Side.SERVER)), //Server handler for ServerTick start.
|
||||
//HANDLER_TICKSTOP (RunType.ONREQUEST, EnumSet.of(Side.CLIENT, Side.SERVER)), //Server handler for ServerTick stop.
|
||||
PACKET_INBOUND (RunType.REALTIME, Side.SERVER), //Outbound packet analysis
|
||||
PACKET_OUTBOUND (RunType.REALTIME, Side.SERVER), //Inbound packet analysis
|
||||
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
package mcp.mobius.opis.commands.server;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.dedicated.DedicatedServer;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
|
||||
public class CommandHandler extends CommandBase implements IOpisCommand {
|
||||
|
||||
@Override
|
||||
public String getCommandName() {
|
||||
return "opis_handler";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandNameOpis() {
|
||||
return this.getCommandName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender icommandsender) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender icommandsender, String[] astring) {
|
||||
if (icommandsender instanceof EntityPlayerMP){
|
||||
icommandsender.addChatMessage(new ChatComponentText("DEPRECATED ! Please run /opis instead."));
|
||||
return;
|
||||
}
|
||||
|
||||
//ArrayList<DataHandler> stats = TickHandlerManager.getCumulatedStatsServer();
|
||||
|
||||
//for (DataHandler s : stats)
|
||||
// icommandsender.addChatMessage(new ChatComponentText(String.format("%s : %.2f", s.name, s.update.toString())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRequiredPermissionLevel()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canCommandSenderUseCommand(ICommandSender sender)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Opens timing data for server side tick handlers.";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -44,8 +44,6 @@ public class CommandHelp extends CommandBase implements IOpisCommand {
|
||||
new CommandKill(),
|
||||
new CommandKillAll(),
|
||||
|
||||
new CommandHandler(),
|
||||
|
||||
new CommandAddPrivileged(),
|
||||
new CommandRmPrivileged()
|
||||
};
|
||||
|
||||
@@ -4,7 +4,6 @@ import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.events.OpisServerTickHandler;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
|
||||
@@ -6,7 +6,6 @@ import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.events.OpisServerTickHandler;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
|
||||
@@ -27,7 +27,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataNetworkTick;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataPacket;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataPacket250;
|
||||
@@ -69,7 +68,6 @@ public enum DataType {
|
||||
DATAENTITYPERCLASS (DataEntityPerClass.class),
|
||||
DATAENTITYRENDER (DataEntityRender.class),
|
||||
DATAEVENT (DataEvent.class),
|
||||
DATAHANDLER (DataHandler.class),
|
||||
DATANETWORKTICK (DataNetworkTick.class),
|
||||
DATAPACKET (DataPacket.class),
|
||||
DATAPACKET250 (DataPacket250.class),
|
||||
|
||||
@@ -69,6 +69,6 @@ public class DataEvent implements ISerializable, Comparable {
|
||||
|
||||
@Override
|
||||
public int compareTo(Object o) {
|
||||
return this.update.compareTo(((DataHandler)o).update);
|
||||
return this.update.compareTo(((DataEvent)o).update);
|
||||
}
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package mcp.mobius.opis.data.holders.newtypes;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteArrayDataOutput;
|
||||
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerHandler;
|
||||
|
||||
public class DataHandler implements ISerializable, Comparable {
|
||||
public CachedString name;
|
||||
public DataTiming update;
|
||||
|
||||
/*
|
||||
public DataHandler fillServer(IScheduledTickHandler ticker){
|
||||
double timingPre = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.get(ticker).getGeometricMean();
|
||||
double timingPost = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTOP.getProfiler())).dataServer.get(ticker).getGeometricMean();
|
||||
|
||||
this.update = new DataTiming(timingPre + timingPost);
|
||||
this.name = new CachedString(TickHandlerManager.getHandlerName(ticker));
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public DataHandler fillRender(IScheduledTickHandler ticker){
|
||||
double timingPre = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataRender.get(ticker).getGeometricMean();
|
||||
double timingPost = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTOP.getProfiler())).dataRender.get(ticker).getGeometricMean();
|
||||
|
||||
this.update = new DataTiming(timingPre + timingPost);
|
||||
this.name = new CachedString(TickHandlerManager.getHandlerName(ticker));
|
||||
|
||||
return this;
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void writeToStream(ByteArrayDataOutput stream){
|
||||
this.name.writeToStream(stream);
|
||||
this.update.writeToStream(stream);
|
||||
}
|
||||
|
||||
public static DataHandler readFromStream(ByteArrayDataInput stream){
|
||||
DataHandler retVal = new DataHandler();
|
||||
retVal.name = CachedString.readFromStream(stream);
|
||||
retVal.update = DataTiming.readFromStream(stream);
|
||||
return retVal;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(Object o) {
|
||||
return this.update.compareTo(((DataHandler)o).update);
|
||||
}
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
package mcp.mobius.opis.data.managers;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerHandler;
|
||||
|
||||
public class TickHandlerManager {
|
||||
|
||||
public static Class SingleIntervalHandlerReflect;
|
||||
public static Field wrapped;
|
||||
|
||||
static {
|
||||
try{
|
||||
SingleIntervalHandlerReflect = Class.forName("cpw.mods.fml.common.SingleIntervalHandler");
|
||||
wrapped = SingleIntervalHandlerReflect.getDeclaredField("wrapped");
|
||||
wrapped.setAccessible(true);
|
||||
|
||||
} catch (Exception e) {
|
||||
|
||||
throw new RuntimeException(e);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
public static ArrayList<DataHandler> getCumulatedStatsServer(){
|
||||
ArrayList<DataHandler> retVal = new ArrayList<DataHandler>();
|
||||
for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.keySet())
|
||||
retVal.add(new DataHandler().fillServer(ticker));
|
||||
|
||||
Collections.sort(retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
public static ArrayList<DataHandler> getCumulatedStatsRender(){
|
||||
ArrayList<DataHandler> retVal = new ArrayList<DataHandler>();
|
||||
for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataRender.keySet())
|
||||
retVal.add(new DataHandler().fillRender(ticker));
|
||||
|
||||
Collections.sort(retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
public static String getHandlerName(IScheduledTickHandler handler){
|
||||
String name = handler.getLabel();
|
||||
if (name == null || name.equals("")){
|
||||
if (handler instanceof SingleIntervalHandler){
|
||||
try{
|
||||
Object ticker = wrapped.get(handler);
|
||||
name = ticker.getClass().getName();
|
||||
} catch (Exception e) {
|
||||
name = "<Unnamed SingleIntervalHandler>";
|
||||
}
|
||||
} else {
|
||||
name = handler.getClass().getName();
|
||||
}
|
||||
}
|
||||
|
||||
return name;
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
public static DataTiming getTotalUpdateTime(){
|
||||
double updateTime = 0D;
|
||||
for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.keySet())
|
||||
updateTime += new DataHandler().fillServer(ticker).update.timing;
|
||||
|
||||
return new DataTiming(updateTime);
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -12,6 +12,9 @@ public class ProfilerEvent extends ProfilerAbstract {
|
||||
private IClock clock = Clock.getNewClock();
|
||||
public HashBasedTable<Class, String, DescriptiveStatistics> data = HashBasedTable.create();
|
||||
public HashBasedTable<Class, String, String> dataMod = HashBasedTable.create();
|
||||
|
||||
public HashBasedTable<Class, String, DescriptiveStatistics> dataTick = HashBasedTable.create();
|
||||
public HashBasedTable<Class, String, String> dataModTick = HashBasedTable.create();
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
@@ -27,14 +30,31 @@ public class ProfilerEvent extends ProfilerAbstract {
|
||||
public void stop(Object event, Object pkg, Object handler, Object mod) {
|
||||
clock.stop();
|
||||
|
||||
try{
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
data.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
data.put(event.getClass(), name, new DescriptiveStatistics(250));
|
||||
dataMod.put(event.getClass(), name, (String)mod);
|
||||
data.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
String eventName = event.getClass().getSimpleName();
|
||||
if (eventName.contains("TickEvent")){
|
||||
|
||||
try{
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
dataTick.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
dataTick.put(event.getClass(), name, new DescriptiveStatistics(250));
|
||||
dataModTick.put(event.getClass(), name, (String)mod);
|
||||
dataTick.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
try{
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
data.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
data.put(event.getClass(), name, new DescriptiveStatistics(250));
|
||||
dataMod.put(event.getClass(), name, (String)mod);
|
||||
data.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
import mcp.mobius.opis.data.profilers.Clock.IClock;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
public class ProfilerHandler extends ProfilerAbstract {
|
||||
|
||||
private IClock clockServer = Clock.getNewClock();
|
||||
private IClock clockRender = Clock.getNewClock();
|
||||
//public WeakHashMap<IScheduledTickHandler, DescriptiveStatistics> dataServer = new WeakHashMap<IScheduledTickHandler, DescriptiveStatistics>();
|
||||
//public WeakHashMap<IScheduledTickHandler, DescriptiveStatistics> dataRender = new WeakHashMap<IScheduledTickHandler, DescriptiveStatistics>();
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start(Object key1, Object key2) {
|
||||
/*
|
||||
IScheduledTickHandler ticker = (IScheduledTickHandler) key1;
|
||||
EnumSet<TickType> ticksToRun = (EnumSet<TickType>) key2;
|
||||
|
||||
if (ticksToRun.contains(TickType.SERVER) && ticksToRun.size() == 1){
|
||||
if (!dataServer.containsKey(ticker))
|
||||
dataServer.put(ticker, new DescriptiveStatistics());
|
||||
|
||||
clockServer.start();
|
||||
}
|
||||
|
||||
else if (ticksToRun.contains(TickType.RENDER) && ticksToRun.size() == 1){
|
||||
if (!dataRender.containsKey(ticker))
|
||||
dataRender.put(ticker, new DescriptiveStatistics());
|
||||
|
||||
clockRender.start();
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop(Object key1, Object key2) {
|
||||
/*
|
||||
IScheduledTickHandler ticker = (IScheduledTickHandler) key1;
|
||||
EnumSet<TickType> ticksToRun = (EnumSet<TickType>) key2;
|
||||
if (ticksToRun.contains(TickType.SERVER) && ticksToRun.size() == 1){
|
||||
clockServer.stop();
|
||||
dataServer.get(ticker).addValue((double)clockServer.getDelta());
|
||||
}
|
||||
|
||||
else if (ticksToRun.contains(TickType.RENDER) && ticksToRun.size() == 1){
|
||||
clockRender.stop();
|
||||
dataRender.get(ticker).addValue((double)clockRender.getDelta());
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
@@ -21,9 +21,7 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockRender;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntityRender;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEvent;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerRenderBlock;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerRenderEntity;
|
||||
|
||||
@@ -8,6 +8,7 @@ import net.minecraftforge.event.entity.EntityEvent;
|
||||
|
||||
public class OpisServerEventHandler {
|
||||
|
||||
/*
|
||||
public static boolean printEntityTrace = false;
|
||||
public static boolean printEntityFull = false;
|
||||
|
||||
@@ -34,4 +35,5 @@ public class OpisServerEventHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -29,7 +29,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEvent;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerPacket;
|
||||
|
||||
@@ -17,7 +17,6 @@ import mcp.mobius.opis.commands.server.CommandChunkDump;
|
||||
import mcp.mobius.opis.commands.server.CommandChunkList;
|
||||
import mcp.mobius.opis.commands.server.CommandEntityCreate;
|
||||
import mcp.mobius.opis.commands.server.CommandFrequency;
|
||||
import mcp.mobius.opis.commands.server.CommandHandler;
|
||||
import mcp.mobius.opis.commands.server.CommandHelp;
|
||||
import mcp.mobius.opis.commands.server.CommandKill;
|
||||
import mcp.mobius.opis.commands.server.CommandKillAll;
|
||||
@@ -34,7 +33,6 @@ import mcp.mobius.opis.data.profilers.ProfilerDimBlockTick;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerDimTick;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEvent;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerHandler;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerNetworkTick;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerPacket;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerRenderBlock;
|
||||
@@ -153,8 +151,8 @@ public class modOpis {
|
||||
ProfilerSection.RENDER_TILEENTITY .setProfiler(new ProfilerRenderTileEntity());
|
||||
ProfilerSection.RENDER_ENTITY .setProfiler(new ProfilerRenderEntity());
|
||||
ProfilerSection.RENDER_BLOCK .setProfiler(new ProfilerRenderBlock());
|
||||
ProfilerSection.HANDLER_TICKSTART .setProfiler(new ProfilerHandler());
|
||||
ProfilerSection.HANDLER_TICKSTOP .setProfiler(new ProfilerHandler());
|
||||
//ProfilerSection.HANDLER_TICKSTART .setProfiler(new ProfilerHandler());
|
||||
//ProfilerSection.HANDLER_TICKSTOP .setProfiler(new ProfilerHandler());
|
||||
ProfilerSection.EVENT_INVOKE .setProfiler(new ProfilerEvent());
|
||||
}
|
||||
|
||||
@@ -186,7 +184,6 @@ public class modOpis {
|
||||
event.registerServerCommand(new CommandKill());
|
||||
event.registerServerCommand(new CommandKillAll());
|
||||
event.registerServerCommand(new CommandReset());
|
||||
event.registerServerCommand(new CommandHandler());
|
||||
event.registerServerCommand(new CommandEntityCreate());
|
||||
event.registerServerCommand(new CommandOpis());
|
||||
event.registerServerCommand(new CommandAddPrivileged());
|
||||
|
||||
@@ -286,7 +286,14 @@ public class PacketManager extends FMLIndexedMessageToMessageCodec<PacketBase>
|
||||
timingEvents.add(new DataEvent().fill(cell, eventMod.get(cell.getRowKey(), cell.getColumnKey())));
|
||||
}
|
||||
|
||||
//PacketManager.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player);
|
||||
ArrayList<DataEvent> timingTicks = new ArrayList<DataEvent>();
|
||||
HashBasedTable<Class, String, DescriptiveStatistics> eventTickData = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).dataTick;
|
||||
HashBasedTable<Class, String, String> eventTickMod = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).dataModTick;
|
||||
for (Cell<Class, String, DescriptiveStatistics> cell : eventTickData.cellSet()){
|
||||
timingTicks.add(new DataEvent().fill(cell, eventTickMod.get(cell.getRowKey(), cell.getColumnKey())));
|
||||
}
|
||||
|
||||
PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_HANDLERS, timingTicks), player);
|
||||
PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_ENTITIES, timingEntities), player);
|
||||
PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_TILEENTS, timingTileEnts), player);
|
||||
PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_TILEENTS_PER_CLASS, timingTEsClass), player);
|
||||
|
||||
@@ -26,14 +26,12 @@ import mcp.mobius.opis.data.holders.basetypes.SerialString;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTick;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayStatus;
|
||||
|
||||
@@ -16,13 +16,11 @@ import mcp.mobius.opis.api.MessageHandlerRegistrar;
|
||||
import mcp.mobius.opis.api.TabPanelRegistrar;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.StringCache;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.gui.font.Fonts;
|
||||
import mcp.mobius.opis.gui.font.TrueTypeFont;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks;
|
||||
|
||||
@@ -18,7 +18,6 @@ import mcp.mobius.opis.api.ITabPanel;
|
||||
import mcp.mobius.opis.data.holders.newtypes.CachedString;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
|
||||
@@ -14,8 +14,9 @@ import javax.swing.table.DefaultTableModel;
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.api.ITabPanel;
|
||||
import mcp.mobius.opis.data.holders.newtypes.CachedString;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
@@ -43,19 +44,19 @@ public class PanelRenderHandlers extends JPanel implements ITabPanel, IMessageHa
|
||||
add(scrollPane, "cell 0 1 3 1,grow");
|
||||
|
||||
table = new JTableStats(
|
||||
new String[] {"Name", "Update Time"},
|
||||
new Class[] {String.class, DataTiming.class}
|
||||
new String[] {"Mod", "Tick", "Update Time"},
|
||||
new Class[] {CachedString.class, String.class, DataTiming.class}
|
||||
);
|
||||
scrollPane.setViewportView(table);
|
||||
}
|
||||
|
||||
public void setTable(ArrayList<DataHandler> data){
|
||||
public void setTable(ArrayList<DataEvent> data){
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, DataHandler.class);
|
||||
int row = this.updateData(table, model, DataEvent.class);
|
||||
|
||||
for (DataHandler o : data){
|
||||
model.addRow(new Object[] {o.name, o.update});
|
||||
for (DataEvent o : data){
|
||||
model.addRow(new Object[] {o.mod, o.event.toString().split("\\$")[1], o.update});
|
||||
}
|
||||
|
||||
this.dataUpdated(table, model, row);
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.awt.event.ActionListener;
|
||||
import mcp.mobius.opis.api.ITabPanel;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.newtypes.CachedString;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
@@ -48,8 +48,8 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
add(scrollPane, "cell 0 1 2 1,grow");
|
||||
|
||||
table = new JTableStats(
|
||||
new String[] {"Name", "Update Time"},
|
||||
new Class[] {CachedString.class, DataTiming.class}
|
||||
new String[] {"Mod", "Tick", "Update Time"},
|
||||
new Class[] {CachedString.class, String.class, DataTiming.class}
|
||||
);
|
||||
scrollPane.setViewportView(table);
|
||||
|
||||
@@ -68,11 +68,11 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.getTable().clearTable(DataHandler.class);
|
||||
int row = this.getTable().clearTable(DataEvent.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataHandler data = (DataHandler)o;
|
||||
model.addRow(new Object[] {data.name, data.update});
|
||||
DataEvent data = (DataEvent)o;
|
||||
model.addRow(new Object[] {data.mod, data.event.toString().split("\\$")[1], data.update});
|
||||
}
|
||||
|
||||
this.getTable().dataUpdated(row);
|
||||
|
||||
Reference in new issue
Block a user