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

Mqtt311Decoder: use ImmutableList.Builder #186

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Mqtt311Decoder: use ImmutableList.Builder #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06f8423
Mqtt311Decoder: use ImmutableList.Builder
Aaronontheweb Aug 30, 2024
41f3880
Merge branch 'dev' into perf-optimization
Aaronontheweb Sep 11, 2024
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
41 changes: 25 additions & 16 deletions src/TurboMqtt/Protocol/Mqtt311Decoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class Mqtt311Decoder
private ReadOnlyMemory<byte> _remainder = ReadOnlyMemory<byte>.Empty;

public bool TryDecode(in ReadOnlyMemory<byte> additionalData, out ImmutableList<MqttPacket> packets)
{
{
packets = ImmutableList<MqttPacket>.Empty;
var rValue = false;

Expand All @@ -43,6 +43,8 @@ public bool TryDecode(in ReadOnlyMemory<byte> additionalData, out ImmutableList<
_remainder = workingBuffer;
return false;
}

var packetBuilder = ImmutableList.CreateBuilder<MqttPacket>();

while (workingBuffer.Length > 0)
{
Expand All @@ -59,13 +61,18 @@ public bool TryDecode(in ReadOnlyMemory<byte> additionalData, out ImmutableList<

// extract packet size (the packet span will automatically advance past the size header)
if (!TryGetPacketLength(ref currentPacket, out packetSize))
return rValue; // we need more data to decode the packet size
{
packets = packetBuilder.ToImmutable();
return rValue;
}


// check to see if we have enough data to decode the packet
if (currentPacket.Length < packetSize)
{
// save the remainder
_remainder = workingBuffer;
packets = packetBuilder.ToImmutable();
return rValue;
}

Expand All @@ -89,67 +96,67 @@ public bool TryDecode(in ReadOnlyMemory<byte> additionalData, out ImmutableList<
{
case MqttPacketType.Publish:
{
packets = packets.Add(DecodePublish(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodePublish(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.PubAck:
{
packets = packets.Add(DecodePubAck(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodePubAck(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.PubRec:
{
packets = packets.Add(DecodePubRec(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodePubRec(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.PubRel:
{
packets = packets.Add(DecodePubRel(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodePubRel(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.PubComp:
{
packets = packets.Add(DecodePubComp(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodePubComp(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.PingReq:
packets = packets.Add(PingReqPacket.Instance);
packetBuilder.Add(PingReqPacket.Instance);
break;
case MqttPacketType.PingResp:
packets = packets.Add(PingRespPacket.Instance);
packetBuilder.Add(PingRespPacket.Instance);
break;
case MqttPacketType.Connect:
{
packets = packets.Add(DecodeConnect(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeConnect(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.ConnAck:
{
packets = packets.Add(DecodeConnAck(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeConnAck(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.SubAck:
{
packets = packets.Add(DecodeSubAck(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeSubAck(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.Subscribe:
{
packets = packets.Add(DecodeSubscribe(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeSubscribe(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.Unsubscribe:
{
packets = packets.Add(DecodeUnsubscribe(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeUnsubscribe(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.UnsubAck:
{
packets = packets.Add(DecodeUnsubAck(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeUnsubAck(ref bufferForMsg, packetSize, headerLength));
break;
}
case MqttPacketType.Disconnect:
packets = packets.Add(DecodeDisconnect(ref bufferForMsg, packetSize, headerLength));
packetBuilder.Add(DecodeDisconnect(ref bufferForMsg, packetSize, headerLength));
break;
case MqttPacketType.Auth: // MQTT 5.0 only - should throw an exception if we see this
throw new NotSupportedException("MQTT 5.0 packets are not supported.");
Expand All @@ -170,6 +177,8 @@ public bool TryDecode(in ReadOnlyMemory<byte> additionalData, out ImmutableList<
throw new MqttDecoderException($"Error decoding packet of predicted size [{headerLength + packetSize}]", ex, MqttProtocolVersion.V3_1_1, packetType);
}
}

packets = packetBuilder.ToImmutable();

return rValue;
}
Expand Down