-
Notifications
You must be signed in to change notification settings - Fork 832
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
231 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 21 additions & 97 deletions
118
src/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,121 +1,45 @@ | ||
| package com.esotericsoftware.kryo.serializers; | ||
|
|
||
| import static com.esotericsoftware.kryo.util.UnsafeUtil.unsafe; | ||
| import static com.esotericsoftware.minlog.Log.TRACE; | ||
| import static com.esotericsoftware.minlog.Log.trace; | ||
| package com.esotericsoftware.kryo.serializers; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.Field; | ||
| import java.util.List; | ||
|
|
||
| import com.esotericsoftware.kryo.serializers.FieldSerializer.CachedField; | ||
| import com.esotericsoftware.kryo.serializers.UnsafeCacheFields.UnsafeRegionField; | ||
| import com.esotericsoftware.kryo.util.IntArray; | ||
| import com.esotericsoftware.reflectasm.FieldAccess; | ||
|
|
||
| /* Helper class for implementing FieldSerializer using Unsafe-based approach. | ||
| /* Helper interface for using Unsafe-based operations inside FieldSerializer. | ||
| * @author Roman Levenstein <[email protected]> */ | ||
| final class FieldSerializerUnsafeUtil { | ||
| private FieldSerializer serializer; | ||
|
|
||
| public FieldSerializerUnsafeUtil (FieldSerializer serializer) { | ||
| this.serializer = serializer; | ||
| } | ||
| interface FieldSerializerUnsafeUtil { | ||
|
|
||
| /** Use Unsafe-based information about fields layout in memory to build a list of cached fields and memory regions representing | ||
| * consecutive fields in memory */ | ||
| public void createUnsafeCacheFieldsAndRegions (List<Field> validFields, List<CachedField> cachedFields, int baseIndex, | ||
| IntArray useAsm) { | ||
| // Find adjacent fields of primitive types | ||
| long startPrimitives = 0; | ||
| long endPrimitives = 0; | ||
| boolean lastWasPrimitive = false; | ||
| int primitiveLength = 0; | ||
| int lastAccessIndex = -1; | ||
| Field lastField = null; | ||
| long fieldOffset = -1; | ||
| long fieldEndOffset = -1; | ||
| long lastFieldEndOffset = -1; | ||
| public abstract void createUnsafeCacheFieldsAndRegions (List<Field> validFields, List<CachedField> cachedFields, | ||
| int baseIndex, IntArray useAsm); | ||
|
|
||
| for (int i = 0, n = validFields.size(); i < n; i++) { | ||
| Field field = validFields.get(i); | ||
| public abstract long getObjectFieldOffset (Field field); | ||
|
|
||
| int accessIndex = -1; | ||
| if (serializer.access != null && useAsm.get(baseIndex + i) == 1) | ||
| accessIndex = ((FieldAccess)serializer.access).getIndex(field.getName()); | ||
| static class Factory { | ||
| static Constructor<FieldSerializerUnsafeUtil> fieldSerializerUnsafeUtilConstructor; | ||
|
|
||
| fieldOffset = unsafe().objectFieldOffset(field); | ||
| fieldEndOffset = fieldOffset + fieldSizeOf(field.getType()); | ||
| static { | ||
| try { | ||
| fieldSerializerUnsafeUtilConstructor = (Constructor<FieldSerializerUnsafeUtil>)FieldSerializer.class.getClassLoader() | ||
| .loadClass("com.esotericsoftware.kryo.serializers.FieldSerializerUnsafeUtilImpl") | ||
| .getConstructor(FieldSerializer.class); | ||
| } catch (Throwable e) { | ||
|
|
||
| if (!field.getType().isPrimitive() && lastWasPrimitive) { | ||
| // This is not a primitive field. Therefore, it marks | ||
| // the end of a region of primitive fields | ||
| endPrimitives = lastFieldEndOffset; | ||
| lastWasPrimitive = false; | ||
| if (primitiveLength > 1) { | ||
| if (TRACE) | ||
| trace("kryo", "Class " + serializer.getType().getName() | ||
| + ". Found a set of consecutive primitive fields. Number of fields = " + primitiveLength | ||
| + ". Byte length = " + (endPrimitives - startPrimitives) + " Start offset = " + startPrimitives | ||
| + " endOffset=" + endPrimitives); | ||
| // TODO: register a region instead of a field | ||
| CachedField cf = new UnsafeRegionField(startPrimitives, (endPrimitives - startPrimitives)); | ||
| cf.field = lastField; | ||
| cachedFields.add(cf); | ||
| } else { | ||
| if (lastField != null) | ||
| cachedFields.add(serializer.newCachedField(lastField, cachedFields.size(), lastAccessIndex)); | ||
| } | ||
| cachedFields.add(serializer.newCachedField(field, cachedFields.size(), accessIndex)); | ||
| } else if (!field.getType().isPrimitive()) { | ||
| cachedFields.add(serializer.newCachedField(field, cachedFields.size(), accessIndex)); | ||
| } else if (!lastWasPrimitive) { | ||
| // If previous field was non primitive, it marks a start | ||
| // of a region of primitive fields | ||
| startPrimitives = fieldOffset; | ||
| lastWasPrimitive = true; | ||
| primitiveLength = 1; | ||
| } else { | ||
| primitiveLength++; | ||
| } | ||
|
|
||
| lastAccessIndex = accessIndex; | ||
| lastField = field; | ||
| lastFieldEndOffset = fieldEndOffset; | ||
| } | ||
|
|
||
| if (!serializer.getUseAsmEnabled() && serializer.getUseMemRegions() && lastWasPrimitive) { | ||
| endPrimitives = lastFieldEndOffset; | ||
| if (primitiveLength > 1) { | ||
| if (TRACE) { | ||
| trace("kryo", "Class " + serializer.getType().getName() | ||
| + ". Found a set of consecutive primitive fields. Number of fields = " + primitiveLength + ". Byte length = " | ||
| + (endPrimitives - startPrimitives) + " Start offset = " + startPrimitives + " endOffset=" + endPrimitives); | ||
| static FieldSerializerUnsafeUtil getInstance (FieldSerializer serializer) { | ||
| if (fieldSerializerUnsafeUtilConstructor != null) { | ||
| try { | ||
| return fieldSerializerUnsafeUtilConstructor.newInstance(serializer); | ||
| } catch (Exception e) { | ||
| } | ||
| // register a region instead of a field | ||
| CachedField cf = new UnsafeRegionField(startPrimitives, (endPrimitives - startPrimitives)); | ||
| cf.field = lastField; | ||
| cachedFields.add(cf); | ||
| } else { | ||
| if (lastField != null) cachedFields.add(serializer.newCachedField(lastField, cachedFields.size(), lastAccessIndex)); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /** Returns the in-memory size of a field which has a given class */ | ||
| private int fieldSizeOf (Class<?> clazz) { | ||
| if (clazz == int.class || clazz == float.class) return 4; | ||
|
|
||
| if (clazz == long.class || clazz == double.class) return 8; | ||
|
|
||
| if (clazz == byte.class || clazz == boolean.class) return 1; | ||
|
|
||
| if (clazz == short.class || clazz == char.class) return 2; | ||
|
|
||
| // Everything else is a reference to an object, i.e. an address | ||
| return unsafe().addressSize(); | ||
| } | ||
|
|
||
| long getObjectFieldOffset (Field field) { | ||
| return unsafe().objectFieldOffset(field); | ||
| } | ||
| } |
119 changes: 119 additions & 0 deletions
119
src/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package com.esotericsoftware.kryo.serializers; | ||
|
|
||
| import static com.esotericsoftware.kryo.util.UnsafeUtil.unsafe; | ||
| import static com.esotericsoftware.minlog.Log.TRACE; | ||
| import static com.esotericsoftware.minlog.Log.trace; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.util.List; | ||
|
|
||
| import com.esotericsoftware.kryo.serializers.FieldSerializer.CachedField; | ||
| import com.esotericsoftware.kryo.serializers.UnsafeCacheFields.UnsafeRegionField; | ||
| import com.esotericsoftware.kryo.util.IntArray; | ||
| import com.esotericsoftware.reflectasm.FieldAccess; | ||
|
|
||
| /* Helper class for implementing FieldSerializer using Unsafe-based approach. | ||
| * @author Roman Levenstein <[email protected]> */ | ||
| final class FieldSerializerUnsafeUtilImpl implements FieldSerializerUnsafeUtil { | ||
| private FieldSerializer serializer; | ||
|
|
||
| public FieldSerializerUnsafeUtilImpl (FieldSerializer serializer) { | ||
| this.serializer = serializer; | ||
| } | ||
|
|
||
| public void createUnsafeCacheFieldsAndRegions (List<Field> validFields, List<CachedField> cachedFields, int baseIndex, | ||
| IntArray useAsm) { | ||
| // Find adjacent fields of primitive types | ||
| long startPrimitives = 0; | ||
| long endPrimitives = 0; | ||
| boolean lastWasPrimitive = false; | ||
| int primitiveLength = 0; | ||
| int lastAccessIndex = -1; | ||
| Field lastField = null; | ||
| long fieldOffset = -1; | ||
| long fieldEndOffset = -1; | ||
| long lastFieldEndOffset = -1; | ||
|
|
||
| for (int i = 0, n = validFields.size(); i < n; i++) { | ||
| Field field = validFields.get(i); | ||
|
|
||
| int accessIndex = -1; | ||
| if (serializer.access != null && useAsm.get(baseIndex + i) == 1) | ||
| accessIndex = ((FieldAccess)serializer.access).getIndex(field.getName()); | ||
|
|
||
| fieldOffset = unsafe().objectFieldOffset(field); | ||
| fieldEndOffset = fieldOffset + fieldSizeOf(field.getType()); | ||
|
|
||
| if (!field.getType().isPrimitive() && lastWasPrimitive) { | ||
| // This is not a primitive field. Therefore, it marks | ||
| // the end of a region of primitive fields | ||
| endPrimitives = lastFieldEndOffset; | ||
| lastWasPrimitive = false; | ||
| if (primitiveLength > 1) { | ||
| if (TRACE) | ||
| trace("kryo", "Class " + serializer.getType().getName() | ||
| + ". Found a set of consecutive primitive fields. Number of fields = " + primitiveLength | ||
| + ". Byte length = " + (endPrimitives - startPrimitives) + " Start offset = " + startPrimitives | ||
| + " endOffset=" + endPrimitives); | ||
| // TODO: register a region instead of a field | ||
| CachedField cf = new UnsafeRegionField(startPrimitives, (endPrimitives - startPrimitives)); | ||
| cf.field = lastField; | ||
| cachedFields.add(cf); | ||
| } else { | ||
| if (lastField != null) | ||
| cachedFields.add(serializer.newCachedField(lastField, cachedFields.size(), lastAccessIndex)); | ||
| } | ||
| cachedFields.add(serializer.newCachedField(field, cachedFields.size(), accessIndex)); | ||
| } else if (!field.getType().isPrimitive()) { | ||
| cachedFields.add(serializer.newCachedField(field, cachedFields.size(), accessIndex)); | ||
| } else if (!lastWasPrimitive) { | ||
| // If previous field was non primitive, it marks a start | ||
| // of a region of primitive fields | ||
| startPrimitives = fieldOffset; | ||
| lastWasPrimitive = true; | ||
| primitiveLength = 1; | ||
| } else { | ||
| primitiveLength++; | ||
| } | ||
|
|
||
| lastAccessIndex = accessIndex; | ||
| lastField = field; | ||
| lastFieldEndOffset = fieldEndOffset; | ||
| } | ||
|
|
||
| if (!serializer.getUseAsmEnabled() && serializer.getUseMemRegions() && lastWasPrimitive) { | ||
| endPrimitives = lastFieldEndOffset; | ||
| if (primitiveLength > 1) { | ||
| if (TRACE) { | ||
| trace("kryo", "Class " + serializer.getType().getName() | ||
| + ". Found a set of consecutive primitive fields. Number of fields = " + primitiveLength + ". Byte length = " | ||
| + (endPrimitives - startPrimitives) + " Start offset = " + startPrimitives + " endOffset=" + endPrimitives); | ||
| } | ||
| // register a region instead of a field | ||
| CachedField cf = new UnsafeRegionField(startPrimitives, (endPrimitives - startPrimitives)); | ||
| cf.field = lastField; | ||
| cachedFields.add(cf); | ||
| } else { | ||
| if (lastField != null) cachedFields.add(serializer.newCachedField(lastField, cachedFields.size(), lastAccessIndex)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** Returns the in-memory size of a field which has a given class */ | ||
| private int fieldSizeOf (Class<?> clazz) { | ||
| if (clazz == int.class || clazz == float.class) return 4; | ||
|
|
||
| if (clazz == long.class || clazz == double.class) return 8; | ||
|
|
||
| if (clazz == byte.class || clazz == boolean.class) return 1; | ||
|
|
||
| if (clazz == short.class || clazz == char.class) return 2; | ||
|
|
||
| // Everything else is a reference to an object, i.e. an address | ||
| return unsafe().addressSize(); | ||
| } | ||
|
|
||
| public long getObjectFieldOffset (Field field) { | ||
| return unsafe().objectFieldOffset(field); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.