Network profiling is back !

This commit is contained in:
ProfMobius committed 2014-05-12 19:44:34 +02:00
1 parent 0f47d1b0d5
commit da4d3f5a12
13 files changed
+1026 -57

No files matched your search

@@ -3,6 +3,9 @@ package mcp.mobius.opis.data.profilers;
import java.util.ArrayList;
import java.util.HashMap;
import net.minecraft.network.Packet;
import net.minecraft.network.play.client.C17PacketCustomPayload;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.relauncher.Side;
import mcp.mobius.opis.data.holders.newtypes.DataPacket;
import mcp.mobius.opis.data.holders.newtypes.DataPacket250;
@@ -11,19 +14,13 @@ import mcp.mobius.opis.helpers.Helpers;
public class ProfilerPacket extends ProfilerAbstract {
public long dataAmount = 0;
public ArrayList<DataPacket> data = new ArrayList<DataPacket>();
public HashMap<String, DataPacket> data = new HashMap<String, DataPacket>();
public HashMap<String, DataPacket250> data250 = new HashMap<String, DataPacket250>();
public ArrayList<DataPacket> jabbaSpec = new ArrayList<DataPacket>();
public ProfilerPacket(){
for (int i = 0; i < 256; i++)
data.add(new DataPacket(i));
}
public void startInterval(){
for (DataPacket packet : data)
for (DataPacket packet : data.values())
packet.startInterval();
for (DataPacket250 packet : data250.values())
@@ -36,27 +33,36 @@ public class ProfilerPacket extends ProfilerAbstract {
}
@Override
public void start(Object key) {
/*
if (key != null && Helpers.getEffectiveSide() == Side.SERVER){
//System.out.printf("%s | %s\n", Thread.currentThread().getClass(), Thread.currentThread().getName());
public void start(Object msg, Object size) {
if ((msg != null) && (Helpers.getEffectiveSide() == Side.SERVER)){
if (!(msg instanceof FMLProxyPacket)){
Packet pkt = (Packet) msg;
Packet packet = (Packet)key;
dataAmount += packet.getPacketSize() + 1;
data.get(packet.getPacketId()).fill(packet);
if (packet.getPacketId() == 250){
String channel = ((Packet250CustomPayload)packet).channel;
try{
data250.get(channel).fill(packet);
data.get(msg.getClass().getSimpleName()).fill(pkt, (Integer)size);
} catch (Exception e){
data250.put(channel, new DataPacket250(channel));
data250.get(channel).fill(packet);
data.put(msg.getClass().getSimpleName(), new DataPacket((Packet)msg));
data.get(msg.getClass().getSimpleName()).fill(pkt, (Integer)size);
}
}
}
*/
}
@Override
public void stop(Object msg) {
if ((msg != null) && (Helpers.getEffectiveSide() == Side.SERVER)){
if (msg instanceof FMLProxyPacket){
FMLProxyPacket pkt = (FMLProxyPacket) msg;
String channel = pkt.channel();
try{
data250.get(channel).fill(pkt);
} catch (Exception e){
data250.put(channel, new DataPacket250(channel));
data250.get(channel).fill(pkt);
}
}
}
}
}