Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding BinaryPrimitives support for NETSTANDARD targets #851

Merged
merged 1 commit into from
May 26, 2020
Merged

Adding BinaryPrimitives support for NETSTANDARD targets #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projects/Apigen/apigen/Apigen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,8 +935,8 @@ public void EmitMethodArgumentReader()
{
EmitLine(" internal override Client.Impl.MethodBase DecodeMethodFrom(ReadOnlyMemory<byte> memory)");
EmitLine(" {");
EmitLine(" ushort classId = Util.NetworkOrderDeserializer.ReadUInt16(memory);");
EmitLine(" ushort methodId = Util.NetworkOrderDeserializer.ReadUInt16(memory.Slice(2));");
EmitLine(" ushort classId = Util.NetworkOrderDeserializer.ReadUInt16(memory.Span);");
EmitLine(" ushort methodId = Util.NetworkOrderDeserializer.ReadUInt16(memory.Slice(2).Span);");
EmitLine(" Client.Impl.MethodBase result = DecodeMethodFrom(classId, methodId);");
EmitLine(" if(result != null)");
EmitLine(" {");
Expand Down
2 changes: 1 addition & 1 deletion projects/RabbitMQ.Client/client/impl/CommandAssembler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Command HandleFrame(in InboundFrame f)
{
throw new UnexpectedFrameException(f.Type);
}
m_header = m_protocol.DecodeContentHeaderFrom(NetworkOrderDeserializer.ReadUInt16(f.Payload));
m_header = m_protocol.DecodeContentHeaderFrom(NetworkOrderDeserializer.ReadUInt16(f.Payload.Span));
ulong totalBodyBytes = m_header.ReadFrom(f.Payload.Slice(2));
if (totalBodyBytes > MaxArrayOfBytesSize)
{
Expand Down
6 changes: 3 additions & 3 deletions projects/RabbitMQ.Client/client/impl/ContentHeaderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public virtual object Clone()
internal ulong ReadFrom(ReadOnlyMemory<byte> memory)
{
// Skipping the first two bytes since they arent used (weight - not currently used)
ulong bodySize = NetworkOrderDeserializer.ReadUInt64(memory.Slice(2));
ulong bodySize = NetworkOrderDeserializer.ReadUInt64(memory.Slice(2).Span);
ContentHeaderPropertyReader reader = new ContentHeaderPropertyReader(memory.Slice(10));
ReadPropertiesFrom(ref reader);
return bodySize;
Expand All @@ -83,8 +83,8 @@ internal ulong ReadFrom(ReadOnlyMemory<byte> memory)

internal int WriteTo(Memory<byte> memory, ulong bodySize)
{
NetworkOrderSerializer.WriteUInt16(memory, ZERO); // Weight - not used
NetworkOrderSerializer.WriteUInt64(memory.Slice(2), bodySize);
NetworkOrderSerializer.WriteUInt16(memory.Span, ZERO); // Weight - not used
NetworkOrderSerializer.WriteUInt64(memory.Slice(2).Span, bodySize);

ContentHeaderPropertyWriter writer = new ContentHeaderPropertyWriter(memory.Slice(10));
WritePropertiesTo(ref writer);
Expand Down
8 changes: 4 additions & 4 deletions projects/RabbitMQ.Client/client/impl/ContentHeaderPropertyReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ public void ReadFlagWord()
{
throw new MalformedFrameException("Attempted to read flag word when none advertised");
}
m_flagWord = NetworkOrderDeserializer.ReadUInt16(_memory.Slice(_memoryOffset));
m_flagWord = NetworkOrderDeserializer.ReadUInt16(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 2;
m_bitCount = 0;
}

public uint ReadLong()
{
uint result = NetworkOrderDeserializer.ReadUInt32(_memory.Slice(_memoryOffset));
uint result = NetworkOrderDeserializer.ReadUInt32(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 4;
return result;
}

public ulong ReadLonglong()
{
ulong result = NetworkOrderDeserializer.ReadUInt64(_memory.Slice(_memoryOffset));
ulong result = NetworkOrderDeserializer.ReadUInt64(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 8;
return result;
}
Expand Down Expand Up @@ -130,7 +130,7 @@ public bool ReadPresence()

public ushort ReadShort()
{
ushort result = NetworkOrderDeserializer.ReadUInt16(_memory.Slice(_memoryOffset));
ushort result = NetworkOrderDeserializer.ReadUInt16(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 2;
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion projects/RabbitMQ.Client/client/impl/ContentHeaderPropertyWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void WriteTimestamp(AmqpTimestamp val)

private void EmitFlagWord(bool continuationBit)
{
NetworkOrderSerializer.WriteUInt16(Memory.Slice(Offset), (ushort)(continuationBit ? (_flagWord | 1) : _flagWord));
NetworkOrderSerializer.WriteUInt16(Memory.Slice(Offset).Span, (ushort)(continuationBit ? (_flagWord | 1) : _flagWord));
Offset += 2;
_flagWord = 0;
_bitCount = 0;
Expand Down
10 changes: 5 additions & 5 deletions projects/RabbitMQ.Client/client/impl/Frame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ internal override int GetMinimumPayloadBufferSize()
internal override int WritePayload(Memory<byte> memory)
{
// write protocol class id (2 bytes)
NetworkOrderSerializer.WriteUInt16(memory, _header.ProtocolClassId);
NetworkOrderSerializer.WriteUInt16(memory.Span, _header.ProtocolClassId);
// write header (X bytes)
int bytesWritten = _header.WriteTo(memory.Slice(2), (ulong)_bodyLength);
return 2 + bytesWritten;
Expand Down Expand Up @@ -114,8 +114,8 @@ internal override int GetMinimumPayloadBufferSize()

internal override int WritePayload(Memory<byte> memory)
{
NetworkOrderSerializer.WriteUInt16(memory, _method.ProtocolClassId);
NetworkOrderSerializer.WriteUInt16(memory.Slice(2), _method.ProtocolMethodId);
NetworkOrderSerializer.WriteUInt16(memory.Span, _method.ProtocolClassId);
NetworkOrderSerializer.WriteUInt16(memory.Slice(2).Span, _method.ProtocolMethodId);
var argWriter = new MethodArgumentWriter(memory.Slice(4));
_method.WriteArgumentsTo(ref argWriter);
argWriter.Flush();
Expand Down Expand Up @@ -150,9 +150,9 @@ public OutboundFrame(FrameType type, int channel) : base(type, channel)
internal void WriteTo(Memory<byte> memory)
{
memory.Span[0] = (byte)Type;
NetworkOrderSerializer.WriteUInt16(memory.Slice(1), (ushort)Channel);
NetworkOrderSerializer.WriteUInt16(memory.Slice(1).Span, (ushort)Channel);
int bytesWritten = WritePayload(memory.Slice(7));
NetworkOrderSerializer.WriteUInt32(memory.Slice(3), (uint)bytesWritten);
NetworkOrderSerializer.WriteUInt32(memory.Slice(3).Span, (uint)bytesWritten);
memory.Span[bytesWritten + 7] = Constants.FrameEnd;
ByteCount = bytesWritten + 8;
}
Expand Down
6 changes: 3 additions & 3 deletions projects/RabbitMQ.Client/client/impl/MethodArgumentReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ public byte[] ReadContent()
public uint ReadLong()
{
ClearBits();
uint result = NetworkOrderDeserializer.ReadUInt32(_memory.Slice(_memoryOffset));
uint result = NetworkOrderDeserializer.ReadUInt32(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 4;
return result;
}

public ulong ReadLonglong()
{
ClearBits();
ulong result = NetworkOrderDeserializer.ReadUInt64(_memory.Slice(_memoryOffset));
ulong result = NetworkOrderDeserializer.ReadUInt64(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 8;
return result;
}
Expand All @@ -112,7 +112,7 @@ public byte ReadOctet()
public ushort ReadShort()
{
ClearBits();
ushort result = NetworkOrderDeserializer.ReadUInt16(_memory.Slice(_memoryOffset));
ushort result = NetworkOrderDeserializer.ReadUInt16(_memory.Slice(_memoryOffset).Span);
_memoryOffset += 2;
return result;
}
Expand Down
54 changes: 27 additions & 27 deletions projects/RabbitMQ.Client/client/impl/WireFormatting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static void DecimalToAmqp(decimal value, out byte scale, out int mantissa
public static IList ReadArray(ReadOnlyMemory<byte> memory, out int bytesRead)
{
IList array = new List<object>();
long arrayLength = NetworkOrderDeserializer.ReadUInt32(memory);
long arrayLength = NetworkOrderDeserializer.ReadUInt32(memory.Span);
bytesRead = 4;
while (bytesRead - 4 < arrayLength)
{
Expand All @@ -111,7 +111,7 @@ public static IList ReadArray(ReadOnlyMemory<byte> memory, out int bytesRead)
public static decimal ReadDecimal(ReadOnlyMemory<byte> memory)
{
byte scale = memory.Span[0];
uint unsignedMantissa = NetworkOrderDeserializer.ReadUInt32(memory.Slice(1));
uint unsignedMantissa = NetworkOrderDeserializer.ReadUInt32(memory.Slice(1).Span);
return AmqpToDecimal(scale, unsignedMantissa);
}

Expand All @@ -127,10 +127,10 @@ public static object ReadFieldValue(ReadOnlyMemory<byte> memory, out int bytesRe
return result;
case 'I':
bytesRead += 4;
return NetworkOrderDeserializer.ReadInt32(slice);
return NetworkOrderDeserializer.ReadInt32(slice.Span);
case 'i':
bytesRead += 4;
return NetworkOrderDeserializer.ReadUInt32(slice);
return NetworkOrderDeserializer.ReadUInt32(slice.Span);
case 'D':
bytesRead += 5;
return ReadDecimal(slice);
Expand All @@ -153,16 +153,16 @@ public static object ReadFieldValue(ReadOnlyMemory<byte> memory, out int bytesRe
return (sbyte)slice.Span[0];
case 'd':
bytesRead += 8;
return NetworkOrderDeserializer.ReadDouble(slice);
return NetworkOrderDeserializer.ReadDouble(slice.Span);
case 'f':
bytesRead += 4;
return NetworkOrderDeserializer.ReadSingle(slice);
return NetworkOrderDeserializer.ReadSingle(slice.Span);
case 'l':
bytesRead += 8;
return NetworkOrderDeserializer.ReadInt64(slice);
return NetworkOrderDeserializer.ReadInt64(slice.Span);
case 's':
bytesRead += 2;
return NetworkOrderDeserializer.ReadInt16(slice);
return NetworkOrderDeserializer.ReadInt16(slice.Span);
case 't':
bytesRead += 1;
return slice.Span[0] != 0;
Expand All @@ -179,7 +179,7 @@ public static object ReadFieldValue(ReadOnlyMemory<byte> memory, out int bytesRe

public static byte[] ReadLongstr(ReadOnlyMemory<byte> memory)
{
int byteCount = (int)NetworkOrderDeserializer.ReadUInt32(memory);
int byteCount = (int)NetworkOrderDeserializer.ReadUInt32(memory.Span);
if (byteCount > int.MaxValue)
{
throw new SyntaxErrorException($"Long string too long; byte length={byteCount}, max={int.MaxValue}");
Expand Down Expand Up @@ -211,7 +211,7 @@ public static string ReadShortstr(ReadOnlyMemory<byte> memory, out int bytesRead
public static IDictionary<string, object> ReadTable(ReadOnlyMemory<byte> memory, out int bytesRead)
{
IDictionary<string, object> table = new Dictionary<string, object>();
long tableLength = NetworkOrderDeserializer.ReadUInt32(memory);
long tableLength = NetworkOrderDeserializer.ReadUInt32(memory.Span);
bytesRead = 4;
while ((bytesRead - 4) < tableLength)
{
Expand All @@ -231,7 +231,7 @@ public static IDictionary<string, object> ReadTable(ReadOnlyMemory<byte> memory,

public static AmqpTimestamp ReadTimestamp(ReadOnlyMemory<byte> memory)
{
ulong stamp = NetworkOrderDeserializer.ReadUInt64(memory);
ulong stamp = NetworkOrderDeserializer.ReadUInt64(memory.Span);
// 0-9 is afaict silent on the signedness of the timestamp.
// See also MethodArgumentWriter.WriteTimestamp and AmqpTimestamp itself
return new AmqpTimestamp((long)stamp);
Expand All @@ -241,7 +241,7 @@ public static int WriteArray(Memory<byte> memory, IList val)
{
if (val == null)
{
NetworkOrderSerializer.WriteUInt32(memory, 0);
NetworkOrderSerializer.WriteUInt32(memory.Span, 0);
return 4;
}
else
Expand All @@ -252,7 +252,7 @@ public static int WriteArray(Memory<byte> memory, IList val)
bytesWritten += WriteFieldValue(memory.Slice(4 + bytesWritten), entry); ;
}

NetworkOrderSerializer.WriteUInt32(memory, (uint)bytesWritten);
NetworkOrderSerializer.WriteUInt32(memory.Span, (uint)bytesWritten);
return 4 + bytesWritten;
}
}
Expand Down Expand Up @@ -296,7 +296,7 @@ public static int WriteFieldValue(Memory<byte> memory, object value)
if (MemoryMarshal.TryGetArray(memory, out ArraySegment<byte> segment))
{
int bytesWritten = Encoding.UTF8.GetBytes(val, 0, val.Length, segment.Array, segment.Offset + 5);
NetworkOrderSerializer.WriteUInt32(slice, (uint)bytesWritten);
NetworkOrderSerializer.WriteUInt32(slice.Span, (uint)bytesWritten);
return 5 + bytesWritten;
}

Expand All @@ -306,11 +306,11 @@ public static int WriteFieldValue(Memory<byte> memory, object value)
return 1 + WriteLongstr(slice, val);
case int val:
memory.Span[0] = (byte)'I';
NetworkOrderSerializer.WriteInt32(slice, val);
NetworkOrderSerializer.WriteInt32(slice.Span, val);
return 5;
case uint val:
memory.Span[0] = (byte)'i';
NetworkOrderSerializer.WriteUInt32(slice, val);
NetworkOrderSerializer.WriteUInt32(slice.Span, val);
return 5;
case decimal val:
memory.Span[0] = (byte)'D';
Expand All @@ -334,19 +334,19 @@ public static int WriteFieldValue(Memory<byte> memory, object value)
return 2;
case double val:
memory.Span[0] = (byte)'d';
NetworkOrderSerializer.WriteDouble(slice, val);
NetworkOrderSerializer.WriteDouble(slice.Span, val);
return 9;
case float val:
memory.Span[0] = (byte)'f';
NetworkOrderSerializer.WriteSingle(slice, val);
NetworkOrderSerializer.WriteSingle(slice.Span, val);
return 5;
case long val:
memory.Span[0] = (byte)'l';
NetworkOrderSerializer.WriteInt64(slice, val);
NetworkOrderSerializer.WriteInt64(slice.Span, val);
return 9;
case short val:
memory.Span[0] = (byte)'s';
NetworkOrderSerializer.WriteInt16(slice, val);
NetworkOrderSerializer.WriteInt16(slice.Span, val);
return 3;
case bool val:
memory.Span[0] = (byte)'t';
Expand Down Expand Up @@ -399,13 +399,13 @@ public static int GetFieldValueByteCount(object value)

public static int WriteLong(Memory<byte> memory, uint val)
{
NetworkOrderSerializer.WriteUInt32(memory, val);
NetworkOrderSerializer.WriteUInt32(memory.Span, val);
return 4;
}

public static int WriteLonglong(Memory<byte> memory, ulong val)
{
NetworkOrderSerializer.WriteUInt64(memory, val);
NetworkOrderSerializer.WriteUInt64(memory.Span, val);
return 8;
}

Expand All @@ -423,7 +423,7 @@ public static int WriteLongstr(Memory<byte> memory, byte[] val, int index, int c

public static int WriteShort(Memory<byte> memory, ushort val)
{
NetworkOrderSerializer.WriteUInt16(memory, val);
NetworkOrderSerializer.WriteUInt16(memory.Span, val);
return 2;
}

Expand All @@ -443,7 +443,7 @@ public static int WriteTable(Memory<byte> memory, IDictionary val)
{
if (val == null)
{
NetworkOrderSerializer.WriteUInt32(memory, 0);
NetworkOrderSerializer.WriteUInt32(memory.Span, 0);
return 4;
}
else
Expand All @@ -457,7 +457,7 @@ public static int WriteTable(Memory<byte> memory, IDictionary val)
bytesWritten += WriteFieldValue(slice.Slice(bytesWritten), entry.Value);
}

NetworkOrderSerializer.WriteUInt32(memory, (uint)bytesWritten);
NetworkOrderSerializer.WriteUInt32(memory.Span, (uint)bytesWritten);
return 4 + bytesWritten;
}
}
Expand All @@ -466,7 +466,7 @@ public static int WriteTable(Memory<byte> memory, IDictionary<string, object> va
{
if (val == null)
{
NetworkOrderSerializer.WriteUInt32(memory, 0);
NetworkOrderSerializer.WriteUInt32(memory.Span, 0);
return 4;
}
else
Expand All @@ -480,7 +480,7 @@ public static int WriteTable(Memory<byte> memory, IDictionary<string, object> va
bytesWritten += WriteFieldValue(slice.Slice(bytesWritten), entry.Value);
}

NetworkOrderSerializer.WriteUInt32(memory, (uint)bytesWritten);
NetworkOrderSerializer.WriteUInt32(memory.Span, (uint)bytesWritten);
return 4 + bytesWritten;
}
}
Expand Down
Loading