mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added packet pooling synchronization

Browse Source
This commit is contained in:
Anuken 2018-06-27 14:55:37 -04:00
parent c8069dfee7
commit 085d309528
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/io/anuke/mindustry/net/Net.java
View File

@ -26,6 +26,8 @@ import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
public class Net{ public class Net{
public static final Object packetPoolLock = new Object();
private static boolean server; private static boolean server;
private static boolean active; private static boolean active;
private static boolean clientLoaded; private static boolean clientLoaded;
@ -183,12 +185,16 @@ public class Net{
if(clientLoaded || object instanceof ImportantPacket){ if(clientLoaded || object instanceof ImportantPacket){
if(clientListeners.get(object.getClass()) != null) clientListeners.get(object.getClass()).accept(object); if(clientListeners.get(object.getClass()) != null) clientListeners.get(object.getClass()).accept(object);
if(listeners.get(object.getClass()) != null) listeners.get(object.getClass()).accept(object); if(listeners.get(object.getClass()) != null) listeners.get(object.getClass()).accept(object);
Pools.free(object); synchronized (packetPoolLock) {
Pools.free(object);
}
}else if(!(object instanceof UnimportantPacket)){ }else if(!(object instanceof UnimportantPacket)){
packetQueue.add(object); packetQueue.add(object);
Log.info("Queuing packet {0}.", ClassReflection.getSimpleName(object.getClass())); Log.info("Queuing packet {0}.", ClassReflection.getSimpleName(object.getClass()));
}else{ }else{
Pools.free(object); synchronized (packetPoolLock) {
Pools.free(object);
}
} }
}else{ }else{
Log.err("Unhandled packet type: '{0}'!", ClassReflection.getSimpleName(object.getClass())); Log.err("Unhandled packet type: '{0}'!", ClassReflection.getSimpleName(object.getClass()));
@ -201,7 +207,9 @@ public class Net{
if(serverListeners.get(object.getClass()) != null || listeners.get(object.getClass()) != null){ if(serverListeners.get(object.getClass()) != null || listeners.get(object.getClass()) != null){
if(serverListeners.get(object.getClass()) != null) serverListeners.get(object.getClass()).accept(connection, object); if(serverListeners.get(object.getClass()) != null) serverListeners.get(object.getClass()).accept(connection, object);
if(listeners.get(object.getClass()) != null) listeners.get(object.getClass()).accept(object); if(listeners.get(object.getClass()) != null) listeners.get(object.getClass()).accept(object);
Pools.free(object); synchronized (packetPoolLock) {
Pools.free(object);
}
}else{ }else{
Log.err("Unhandled packet type: '{0}'!", ClassReflection.getSimpleName(object.getClass())); Log.err("Unhandled packet type: '{0}'!", ClassReflection.getSimpleName(object.getClass()));
} }

14
kryonet/src/io/anuke/kryonet/ByteSerializer.java
View File

@ -9,6 +9,8 @@ import io.anuke.mindustry.net.Registrator;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import static io.anuke.mindustry.net.Net.packetPoolLock;
public class ByteSerializer implements Serialization { public class ByteSerializer implements Serialization {
@Override @Override
@ -24,7 +26,9 @@ public class ByteSerializer implements Serialization {
throw new RuntimeException("Unregistered class: " + ClassReflection.getSimpleName(o.getClass())); throw new RuntimeException("Unregistered class: " + ClassReflection.getSimpleName(o.getClass()));
byteBuffer.put(id); byteBuffer.put(id);
((Packet) o).write(byteBuffer); ((Packet) o).write(byteBuffer);
Pools.free(o); synchronized (packetPoolLock) {
Pools.free(o);
}
} }
} }
@ -35,9 +39,11 @@ public class ByteSerializer implements Serialization {
return FrameworkSerializer.read(byteBuffer); return FrameworkSerializer.read(byteBuffer);
}else{ }else{
Class<?> type = Registrator.getByID(id); Class<?> type = Registrator.getByID(id);
Packet packet = (Packet)Pools.obtain(type); synchronized (packetPoolLock) {
packet.read(byteBuffer); Packet packet = (Packet) Pools.obtain(type);
return packet; packet.read(byteBuffer);
return packet;
}
} }
} }