\r
object _lastObject = null;\r
long _lastObjectID = 0;\r
- long _rootObjectID = 0;\r
+ long _rootObjectID = 0;
+ byte[] arrayBuffer;
+ int ArrayBufferLength = 4096;\r
\r
class TypeMetadata\r
{\r
ReadRefTypeObjectInstance (reader, out objectId, out value, out info);\r
break;\r
\r
+ case BinaryElement.UntypedRuntimeObject:\r
+ ReadObjectInstance (reader, true, false, out objectId, out value, out info);\r
+ break;\r
+\r
+ case BinaryElement.UntypedExternalObject:\r
+ ReadObjectInstance (reader, false, false, out objectId, out value, out info);\r
+ break;\r
+\r
case BinaryElement.RuntimeObject:\r
- ReadObjectInstance (reader, true, out objectId, out value, out info);\r
+ ReadObjectInstance (reader, true, true, out objectId, out value, out info);\r
break;\r
\r
case BinaryElement.ExternalObject:\r
- ReadObjectInstance (reader, false, out objectId, out value, out info);\r
+ ReadObjectInstance (reader, false, true, out objectId, out value, out info);\r
break;\r
\r
case BinaryElement.String:\r
_registeredAssemblies [id] = assemblyName;\r
}\r
\r
- private void ReadObjectInstance (BinaryReader reader, bool isRuntimeObject, out long objectId, out object value, out SerializationInfo info)\r
+ private void ReadObjectInstance (BinaryReader reader, bool isRuntimeObject, bool hasTypeInfo, out long objectId, out object value, out SerializationInfo info)\r
{\r
objectId = (long) reader.ReadUInt32 ();\r
\r
- TypeMetadata metadata = ReadTypeMetadata (reader, isRuntimeObject);\r
+ TypeMetadata metadata = ReadTypeMetadata (reader, isRuntimeObject, hasTypeInfo);\r
ReadObjectContent (reader, metadata, objectId, out value, out info);\r
}\r
\r
}\r
\r
case TypeCode.Byte: {\r
- val = reader.ReadBytes (length);\r
+ byte[] arr = new byte [length];\r
+ int pos = 0;\r
+ while (pos < length) {\r
+ int nr = reader.Read (arr, pos, length - pos);\r
+ if (nr == 0) break;\r
+ pos += nr;\r
+ }\r
+ val = arr;\r
break;\r
}\r
\r
case TypeCode.Char: {\r
- val = reader.ReadChars (length);\r
+ char[] arr = new char [length];\r
+ int pos = 0;\r
+ while (pos < length) {\r
+ int nr = reader.Read (arr, pos, length - pos);\r
+ if (nr == 0) break;\r
+ pos += nr;\r
+ }\r
+ val = arr;\r
break;\r
}\r
\r
\r
case TypeCode.Decimal: {\r
Decimal[] arr = new Decimal [length];\r
- for (int n = 0; n < length; n++) arr [n] = Decimal.Parse (reader.ReadString(), CultureInfo.InvariantCulture);\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadDecimal();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.Double: {\r
- Double[] arr = new Double [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadDouble();\r
+ Double[] arr = new Double [length];
+ if (length > 2)\r
+ BlockRead (reader, arr, 8);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadDouble();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.Int16: {\r
short[] arr = new short [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadInt16();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 2);
+ else
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadInt16();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.Int32: {\r
int[] arr = new int [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadInt32();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 4);
+ else
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadInt32();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.Int64: {\r
- long[] arr = new long [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadInt64();\r
+ long[] arr = new long [length];
+ if (length > 2)\r
+ BlockRead (reader, arr, 8);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadInt64();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.SByte: {\r
sbyte[] arr = new sbyte [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadSByte();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 1);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadSByte();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.Single: {\r
float[] arr = new float [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadSingle();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 4);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadSingle();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.UInt16: {\r
ushort[] arr = new ushort [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadUInt16();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 2);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadUInt16();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.UInt32: {\r
uint[] arr = new uint [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadUInt32();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 4);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadUInt32();\r
val = arr;\r
break;\r
}\r
\r
case TypeCode.UInt64: {\r
ulong[] arr = new ulong [length];\r
- for (int n = 0; n < length; n++) arr [n] = reader.ReadUInt64();\r
+ if (length > 2)\r
+ BlockRead (reader, arr, 8);
+ else\r
+ for (int n = 0; n < length; n++) arr [n] = reader.ReadUInt64();\r
val = arr;\r
break;\r
}\r
} \r
}\r
\r
+ private void BlockRead (BinaryReader reader, Array array, int dataSize)\r
+ {
+ int totalSize = Buffer.ByteLength (array);
+
+ if (arrayBuffer == null || (totalSize > arrayBuffer.Length && arrayBuffer.Length != ArrayBufferLength))
+ arrayBuffer = new byte [totalSize <= ArrayBufferLength ? totalSize : ArrayBufferLength];
+
+ int pos = 0;
+ while (totalSize > 0) {
+ int size = totalSize < arrayBuffer.Length ? totalSize : arrayBuffer.Length;
+ int ap = 0;
+ do {
+ int nr = reader.Read (arrayBuffer, ap, size - ap);\r
+ if (nr == 0) break;\r
+ ap += nr;
+ } while (ap < size);
+
+ if (!BitConverter.IsLittleEndian && dataSize > 1)
+ BinaryCommon.SwapBytes (arrayBuffer, size, dataSize);
+
+ Buffer.BlockCopy (arrayBuffer, 0, array, pos, size);
+ totalSize -= size;
+ pos += size;
+ }
+ }
+
+\r
private void ReadArrayOfObject (BinaryReader reader, out long objectId, out object array)\r
{\r
ReadSimpleArray (reader, typeof (object), out objectId, out array);\r
val = array;\r
}\r
\r
- private TypeMetadata ReadTypeMetadata (BinaryReader reader, bool isRuntimeObject)\r
+ private TypeMetadata ReadTypeMetadata (BinaryReader reader, bool isRuntimeObject, bool hasTypeInfo)\r
{\r
TypeMetadata metadata = new TypeMetadata();\r
\r
Type[] types = new Type[fieldCount];\r
string[] names = new string[fieldCount];\r
\r
- TypeTag[] codes = new TypeTag[fieldCount];\r
-\r
for (int n=0; n<fieldCount; n++)\r
names [n] = reader.ReadString ();\r
\r
- for (int n=0; n<fieldCount; n++)\r
- codes [n] = (TypeTag) reader.ReadByte ();\r
-\r
- for (int n=0; n<fieldCount; n++)\r
- types [n] = ReadType (reader, codes[n]);\r
+ if (hasTypeInfo)\r
+ {\r
+ TypeTag[] codes = new TypeTag[fieldCount];\r
\r
+ for (int n=0; n<fieldCount; n++)\r
+ codes [n] = (TypeTag) reader.ReadByte ();\r
+ \r
+ for (int n=0; n<fieldCount; n++)\r
+ types [n] = ReadType (reader, codes[n]);\r
+ }\r
+ \r
// Gets the type\r
\r
if (!isRuntimeObject) \r
\r
if (field == null) throw new SerializationException ("Field \"" + names[n] + "\" not found in class " + metadata.Type.FullName);\r
metadata.MemberInfos [n] = field;\r
+ \r
+ if (!hasTypeInfo) {\r
+ types [n] = field.FieldType;\r
+ }\r
}\r
metadata.MemberNames = null; // Info now in MemberInfos\r
}\r
{\r
string assemblyName = (string)_registeredAssemblies[assemblyId];\r
\r
- if (_binder == null)\r
- {\r
- Assembly assembly = Assembly.Load (assemblyName);\r
- return assembly.GetType (className, true);\r
+ if (_binder != null) {\r
+ Type t = _binder.BindToType (assemblyName, className);\r
+ if (t != null) return t;\r
}\r
- else\r
- return _binder.BindToType (assemblyName, className);\r
+ \r
+ Assembly assembly = Assembly.Load (assemblyName);\r
+ return assembly.GetType (className, true);\r
}\r
\r
public Type ReadType (BinaryReader reader, TypeTag code)\r
projects / mono.git / blobdiff