Commit f2b15420ad595f77b6a3575dd7a6e85411dc69e9 | zig

author	Jonathan Marler <johnnymarler@gmail.com> 2023-02-28 21:00:10-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-03-01 12:21:53-05:00
log	f2b15420ad595f77b6a3575dd7a6e85411dc69e9
tree	714a157e82d7d9cfddfdede6be93306a30c2d141
parent	138e8b162aeecc69cc62f0822e73b1862b7d07f6

std.io.poll: remove done function

2 files changed, 17 insertions(+), 17 deletions(-)

lib
- std
  - child_process.zig
  - io.zig

lib/std/child_process.zig+1-2

...	@@ -235,8 +235,7 @@ pub const ChildProcess = struct {	...	@@ -235,8 +235,7 @@ pub const ChildProcess = struct {
235	});	235	});
236	defer poller.deinit();	236	defer poller.deinit();
237		237
238	while (!poller.done()) {	238	while (try poller.poll()) {
239	try poller.poll();
240	if (poller.fifo(.stdout).count > max_output_bytes)	239	if (poller.fifo(.stdout).count > max_output_bytes)
241	return error.StdoutStreamTooLong;	240	return error.StdoutStreamTooLong;
242	if (poller.fifo(.stderr).count > max_output_bytes)	241	if (poller.fifo(.stderr).count > max_output_bytes)

lib/std/io.zig+16-15

 @@ -249,7 +249,7 @@ pub fn Poller(comptime StreamEnum: type) type {
             self.* = undefined;
         }
-        pub fn poll(self: *Self) !void {
+        pub fn poll(self: *Self) !bool {
             if (builtin.os.tag == .windows) {
                 return pollWindows(self);
             } else {
 @@ -261,16 +261,7 @@ pub fn Poller(comptime StreamEnum: type) type {
             return &self.fifos[@enumToInt(which)];
         }
-        pub fn done(self: Self) bool {
+        fn pollWindows(self: *Self) !bool {
-            if (builtin.os.tag == .windows)
-                return self.windows.first_read_done and self.windows.active.count == 0;
-            for (self.poll_fds) |poll_fd| {
-                if (poll_fd.fd != -1) return false;
-            } else return true;
-        }
-        fn pollWindows(self: *Self) !void {
             const bump_amt = 512;
             if (!self.windows.first_read_done) {
 @@ -295,7 +286,7 @@ pub fn Poller(comptime StreamEnum: type) type {
             }
             while (true) {
-                if (self.windows.active.count == 0) return;
+                if (self.windows.active.count == 0) return false;
                 const status = os.windows.kernel32.WaitForMultipleObjects(
                     self.windows.active.count,
 @@ -338,11 +329,11 @@ pub fn Poller(comptime StreamEnum: type) type {
                     .pending => {},
                     .closed => self.windows.active.removeAt(active_idx),
                 }
-                return;
+                return true;
             }
         }
-        fn pollPosix(self: *Self) !void {
+        fn pollPosix(self: *Self) !bool {
             // We ask for ensureUnusedCapacity with this much extra space. This
             // has more of an effect on small reads because once the reads
             // start to get larger the amount of space an ArrayList will
 @@ -352,8 +343,13 @@ pub fn Poller(comptime StreamEnum: type) type {
             const err_mask = os.POLL.ERR | os.POLL.NVAL | os.POLL.HUP;
             const events_len = try os.poll(&self.poll_fds, std.math.maxInt(i32));
-            if (events_len == 0) return;
+            if (events_len == 0) {
+                for (self.poll_fds) |poll_fd| {
+                    if (poll_fd.fd != -1) return true;
+                } else return false;
+            }
+            var keep_polling = false;
             inline for (&self.poll_fds, &self.fifos) |*poll_fd, *q| {
                 // Try reading whatever is available before checking the error
                 // conditions.
 @@ -366,12 +362,17 @@ pub fn Poller(comptime StreamEnum: type) type {
                     if (amt == 0) {
                         // Remove the fd when the EOF condition is met.
                         poll_fd.fd = -1;
+                    } else {
+                        keep_polling = true;
                     }
                 } else if (poll_fd.revents & err_mask != 0) {
                     // Exclude the fds that signaled an error.
                     poll_fd.fd = -1;
+                } else if (poll_fd.fd != -1) {
+                    keep_polling = true;
                 }
             }
+            return keep_polling;
         }
     };
 }