zambyte/zaprus
1
0
Fork 0
mirror of https://git.robbyzambito.me/zaprus synced 2025-12-20 16:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use dynamic array instead of arraylist

Browse Source 
we know the size (assuming the len is correct) so we can preallocate the whole array
This commit is contained in:
Robby Zambito
2025-04-06 21:32:41 -04:00
parent 2302e6930d
commit 0f4a7c9bcd
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/saprus_message.zig
View File

@@ -117,12 +117,12 @@ pub const SaprusMessage = union(SaprusPacketType) {
fn fromBytesAux( fn fromBytesAux(
comptime packet: SaprusPacketType, comptime packet: SaprusPacketType,
len: u16,
r: std.io.FixedBufferStream([]const u8).Reader, r: std.io.FixedBufferStream([]const u8).Reader,
allocator: Allocator, allocator: Allocator,
) !SaprusMessage { ) !SaprusMessage {
const Header = @field(@FieldType(SaprusMessage, @tagName(packet)), "Header"); const Header = @field(@FieldType(SaprusMessage, @tagName(packet)), "Header");
// Read the length of the header + base64 encoded payload.
const len = try r.readInt(u16, .big);
// Read the header for the current message type. // Read the header for the current message type.
var header_bytes: [@sizeOf(Header)]u8 = undefined; var header_bytes: [@sizeOf(Header)]u8 = undefined;
_ = try r.read(header_bytes[0 .. @bitSizeOf(Header) / 8]); _ = try r.read(header_bytes[0 .. @bitSizeOf(Header) / 8]);
@@ -130,13 +130,13 @@ pub const SaprusMessage = union(SaprusPacketType) {
const header = try header_stream.reader().readStructEndian(Header, .big); const header = try header_stream.reader().readStructEndian(Header, .big);
// Read the base64 bytes into a list to be able to call the decoder on it. // Read the base64 bytes into a list to be able to call the decoder on it.
var payload_buf = std.ArrayList(u8).init(allocator); const payload_buf = try allocator.alloc(u8, len - @bitSizeOf(Header) / 8);
defer payload_buf.deinit(); defer allocator.free(payload_buf);
try r.readAllArrayList(&payload_buf, len); _ = try r.readAll(payload_buf);
// Create a buffer to store the payload in, and decode the base64 bytes into the payload field. // Create a buffer to store the payload in, and decode the base64 bytes into the payload field.
const payload = try allocator.alloc(u8, try base64Dec.calcSizeForSlice(payload_buf.items)); const payload = try allocator.alloc(u8, try base64Dec.calcSizeForSlice(payload_buf));
try base64Dec.decode(payload, payload_buf.items); try base64Dec.decode(payload, payload_buf);
// Return the type of SaprusMessage specified by the `packet` argument. // Return the type of SaprusMessage specified by the `packet` argument.
return @unionInit(SaprusMessage, @tagName(packet), .{ return @unionInit(SaprusMessage, @tagName(packet), .{
@@ -153,9 +153,12 @@ pub const SaprusMessage = union(SaprusPacketType) {
// Read packet type // Read packet type
const packet_type = @as(SaprusPacketType, @enumFromInt(try r.readInt(u16, .big))); const packet_type = @as(SaprusPacketType, @enumFromInt(try r.readInt(u16, .big)));
// Read the length of the header + base64 encoded payload.
const len = try r.readInt(u16, .big);
switch (packet_type) { switch (packet_type) {
.relay => return fromBytesAux(.relay, r, allocator), .relay => return fromBytesAux(.relay, len, r, allocator),
.connection => return fromBytesAux(.connection, r, allocator), .connection => return fromBytesAux(.connection, len, r, allocator),
.file_transfer => return SaprusError.NotImplementedSaprusType, .file_transfer => return SaprusError.NotImplementedSaprusType,
else => return SaprusError.UnknownSaprusType, else => return SaprusError.UnknownSaprusType,
} }