dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved class registration fragmentation values to the serialization class

Browse Source
This commit is contained in:
nathan 2019-06-14 10:57:36 +02:00
parent c697643562
commit c5c709407d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dorkbox/network/connection/RegistrationWrapper.java
View File

@ -33,6 +33,7 @@ import dorkbox.network.pipeline.udp.KryoDecoderUdpCrypto;
import dorkbox.network.pipeline.udp.KryoEncoderUdp; import dorkbox.network.pipeline.udp.KryoEncoderUdp;
import dorkbox.network.pipeline.udp.KryoEncoderUdpCrypto; import dorkbox.network.pipeline.udp.KryoEncoderUdpCrypto;
import dorkbox.network.serialization.NetworkSerializationManager; import dorkbox.network.serialization.NetworkSerializationManager;
import dorkbox.network.serialization.Serialization;
import dorkbox.util.RandomUtil; import dorkbox.util.RandomUtil;
import dorkbox.util.collections.IntMap.Values; import dorkbox.util.collections.IntMap.Values;
import dorkbox.util.collections.LockFreeIntMap; import dorkbox.util.collections.LockFreeIntMap;
@ -47,7 +48,6 @@ import io.netty.channel.Channel;
*/ */
public public
class RegistrationWrapper { class RegistrationWrapper {
private static final int CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE = 400;
public public
enum STATE { ERROR, WAIT, CONTINUE } enum STATE { ERROR, WAIT, CONTINUE }
@ -334,11 +334,11 @@ class RegistrationWrapper {
byte[] details = this.endPoint.getSerialization().getKryoRegistrationDetails(); byte[] details = this.endPoint.getSerialization().getKryoRegistrationDetails();
int length = details.length; int length = details.length;
if (length > CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE) { if (length > Serialization.CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE) {
// it is too large to send in a single packet // it is too large to send in a single packet
// child arrays have index 0 also as their 'index' and 1 is the total number of fragments // child arrays have index 0 also as their 'index' and 1 is the total number of fragments
byte[][] fragments = divideArray(details, CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE); byte[][] fragments = divideArray(details, Serialization.CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE);
if (fragments == null) { if (fragments == null) {
logger.error("Too many classes have been registered for Serialization. Please report this issue"); logger.error("Too many classes have been registered for Serialization. Please report this issue");
@ -390,16 +390,16 @@ class RegistrationWrapper {
// max size of ALL fragments is xxx * 127 // max size of ALL fragments is xxx * 127
if (metaChannel.fragmentedRegistrationDetails == null) { if (metaChannel.fragmentedRegistrationDetails == null) {
metaChannel.remainingFragments = fragment[1]; metaChannel.remainingFragments = fragment[1];
metaChannel.fragmentedRegistrationDetails = new byte[CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE * fragment[1]]; metaChannel.fragmentedRegistrationDetails = new byte[Serialization.CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE * fragment[1]];
} }
System.arraycopy(fragment, 2, metaChannel.fragmentedRegistrationDetails, fragment[0] * CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE, fragment.length - 2); System.arraycopy(fragment, 2, metaChannel.fragmentedRegistrationDetails, fragment[0] * Serialization.CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE, fragment.length - 2);
metaChannel.remainingFragments--; metaChannel.remainingFragments--;
if (fragment[0] + 1 == fragment[1]) { if (fragment[0] + 1 == fragment[1]) {
// this is the last fragment in the in byte array (but NOT necessarily the last fragment to arrive) // this is the last fragment in the in byte array (but NOT necessarily the last fragment to arrive)
int correctSize = (CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE * (fragment[1] - 1)) + (fragment.length - 2); int correctSize = (Serialization.CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE * (fragment[1] - 1)) + (fragment.length - 2);
byte[] correctlySized = new byte[correctSize]; byte[] correctlySized = new byte[correctSize];
System.arraycopy(metaChannel.fragmentedRegistrationDetails, 0, correctlySized, 0, correctSize); System.arraycopy(metaChannel.fragmentedRegistrationDetails, 0, correctlySized, 0, correctSize);
metaChannel.fragmentedRegistrationDetails = correctlySized; metaChannel.fragmentedRegistrationDetails = correctlySized;

4
src/dorkbox/network/serialization/Serialization.java
View File

@ -81,6 +81,8 @@ import io.netty.buffer.Unpooled;
public public
class Serialization implements NetworkSerializationManager { class Serialization implements NetworkSerializationManager {
public static final int CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE = 400;
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Serialization.class.getSimpleName()); private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Serialization.class.getSimpleName());
public static public static
@ -517,7 +519,7 @@ class Serialization implements NetworkSerializationManager {
// save this as a byte array (so registration is faster) // save this as a byte array (so registration is faster)
ByteBuf buffer = Unpooled.buffer(480); ByteBuf buffer = Unpooled.buffer(CLASS_REGISTRATION_VALIDATION_FRAGMENT_SIZE);
kryo.setRegistrationRequired(false); kryo.setRegistrationRequired(false);
try { try {