hare

commit 7e2221d1bbe4a3f68c7e8357b20917bb6c720cdb
parent bc3bc7011f1aa099be360f9172d28403f7937d15
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun, 24 Apr 2022 09:28:22 +0200

Revert "bufio: improve buffered reader performance"

This reverts commit 328c8a7890eb61a7f267631b9f9c7fb2f7e8a94b.

Diffstat:
M
bufio/buffered.ha
 | 
44
+++++++++++++++++---------------------------

1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/bufio/buffered.ha b/bufio/buffered.ha
@@ -128,15 +128,11 @@ fn buffered_close_static(s: *io::stream) void = {
 fn buffered_read(s: *io::stream, buf: []u8) (size | io::EOF | io::error) = {
 	assert(s.reader == &buffered_read);
 	let s = s: *bufstream;
-	if (len(buf) < s.ravail) {
-		buf[..] = s.rbuffer[..len(buf)];
-		s.rbuffer[..s.ravail - len(buf)] = s.rbuffer[len(buf)..s.ravail];
-		s.ravail -= len(buf);
-		return len(buf);
-	};
-	buf[..s.ravail] = s.rbuffer[..s.ravail];
-	if (len(buf) - s.ravail < len(s.rbuffer)) {
-		let z = match (io::read(s.source, s.rbuffer)?) {
+	let n = if (len(buf) < len(s.rbuffer)) len(buf) else len(s.rbuffer);
+	if (n > s.ravail) {
+		let z = match (io::read(s.source, s.rbuffer[s.ravail..])) {
+		case let err: io::error =>
+			return err;
 		case io::EOF =>
 			if (s.ravail == 0) {
 				return io::EOF;
@@ -145,23 +141,15 @@ fn buffered_read(s: *io::stream, buf: []u8) (size | io::EOF | io::error) = {
 		case let z: size =>
 			yield z;
 		};
-		let n = if (len(buf) < z + s.ravail) len(buf) else z + s.ravail;
-		buf[s.ravail..n] = s.rbuffer[..n - s.ravail];
-		s.rbuffer[..len(s.rbuffer) - (n - s.ravail)] = s.rbuffer[n - s.ravail..];
-		s.ravail = z - (n - s.ravail);
-		return n;
-	} else {
-		s.ravail = 0;
-		match (io::read(s.source, buf)?) {
-		case io::EOF =>
-			if (s.ravail == 0) {
-				return io::EOF;
-			};
-			return 0z;
-		case let z: size =>
-			return z;
-		};
+		s.ravail += z;
+		n = if (n > s.ravail) s.ravail else n;
+		assert(n != 0);
 	};
+
+	buf[..n] = s.rbuffer[..n];
+	s.rbuffer[..len(s.rbuffer) - n] = s.rbuffer[n..];
+	s.ravail -= n;
+	return n;
 };
 
 fn buffered_write(s: *io::stream, buf: const []u8) (size | io::error) = {
@@ -227,8 +215,10 @@ fn buffered_write(s: *io::stream, buf: const []u8) (size | io::error) = {
 	defer io::close(&f);
 
 	let buf: [32]u8 = [0...];
-	assert(io::read(&f, buf) as size == 32);
-	assert(source.pos == 32);
+	assert(io::read(&f, buf) as size == 16);
+	assert(source.pos == 16);
+
+	assert(io::read(&f, buf[16..]) as size == 16);
 	assert(bytes::equal(buf, sourcebuf));
 	assert(io::read(&f, buf) is io::EOF);
 	assert(source.pos == len(source.buf));