Commit 1baaf9a503bd399f4da4a9d3e80695b1739ea966 | zig

author	frmdstryr <frmdstryr@protonmail.com> 2019-12-04 13:23:18-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-12-05 10:16:50-05:00
log	1baaf9a503bd399f4da4a9d3e80695b1739ea966
tree	8034e4b1c47ef064db09dc0722f36a4945d3b6d0
parent	8829b5316b1ff1dab9d3d985191e40f481d05441

2 files changed, 16 insertions(+), 1 deletions(-)

lib/std/io.zig+14

...	...	@@ -107,6 +107,13 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)
107	107	fn readFn(in_stream: *Stream, dest: []u8) !usize {
108	108	const self = @fieldParentPtr(Self, "stream", in_stream);
109	109
	110	// Hot path for one byte reads
	111	if (dest.len == 1 and self.end_index > self.start_index) {
	112	dest[0] = self.buffer[self.start_index];
	113	self.start_index += 1;
	114	return 1;
	115	}
	116
110	117	var dest_index: usize = 0;
111	118	while (true) {
112	119	const dest_space = dest.len - dest_index;
...	...	@@ -126,6 +133,13 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)
126	133	if (dest_space < buffer_size) {
127	134	self.start_index = 0;
128	135	self.end_index = try self.unbuffered_in_stream.read(self.buffer[0..]);
	136
	137	// Shortcut
	138	if (self.end_index >= dest_space) {
	139	mem.copy(u8, dest[dest_index..], self.buffer[0..dest_space]);
	140	self.start_index = dest_space;
	141	return dest.len;
	142	}
129	143	} else {
130	144	// asking for so much data that buffering is actually less efficient.
131	145	// forward the request directly to the unbuffered stream

lib/std/io/in_stream.zig+2-1

...	...	@@ -174,7 +174,8 @@ pub fn InStream(comptime ReadError: type) type {
174	174	/// Reads 1 byte from the stream or returns `error.EndOfStream`.
175	175	pub fn readByte(self: *Self) !u8 {
176	176	var result: [1]u8 = undefined;
177		try self.readNoEof(result[0..]);
	177	const amt_read = try self.read(result[0..]);
	178	if (amt_read < 1) return error.EndOfStream;
178	179	return result[0];
179	180	}
180	181