Automatically retry on would block

dkarter · Jan 25, 2022 · ff7785e · ff7785e
1 parent 0e138bc
commit ff7785e
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/io/io_linux.zig b/src/io/io_linux.zig
@@ -798,15 +798,14 @@ pub const Completion = struct {
             },
             .connect => {
                 const result = if (completion.result < 0) switch (-completion.result) {
-                    os.EINTR => {
+                    os.EAGAIN, os.EINPROGRESS, os.EINTR => {
                         completion.io.enqueue(completion);
                         return;
                     },
                     os.EACCES => error.AccessDenied,
                     os.EADDRINUSE => error.AddressInUse,
                     os.EADDRNOTAVAIL => error.AddressNotAvailable,
                     os.EAFNOSUPPORT => error.AddressFamilyNotSupported,
-                    os.EAGAIN, os.EINPROGRESS => error.WouldBlock,
                     os.EALREADY => error.OpenAlreadyInProgress,
                     os.EBADF => error.FileDescriptorInvalid,
                     os.ECONNREFUSED => error.ConnectionRefused,
@@ -840,11 +839,10 @@ pub const Completion = struct {
             },
             .read => {
                 const result = if (completion.result < 0) switch (-completion.result) {
-                    os.EINTR => {
+                    os.EAGAIN, os.EINTR => {
                         completion.io.enqueue(completion);
                         return;
                     },
-                    os.EAGAIN => error.WouldBlock,
                     os.EBADF => error.NotOpenForReading,
                     os.ECONNRESET => error.ConnectionResetByPeer,
                     os.EINVAL => error.Alignment,
@@ -861,11 +859,10 @@ pub const Completion = struct {
             },
             .readev, .recv => {
                 const result = if (completion.result < 0) switch (-completion.result) {
-                    os.EINTR => {
+                    os.EAGAIN, os.EINTR => {
                         completion.io.enqueue(completion);
                         return;
                     },
-                    os.EAGAIN => error.WouldBlock,
                     os.EBADF => error.FileDescriptorInvalid,
                     os.ECONNREFUSED => error.ConnectionRefused,
                     os.ENOMEM => error.SystemResources,
@@ -878,12 +875,11 @@ pub const Completion = struct {
             },
             .writev, .send => {
                 const result = if (completion.result < 0) switch (-completion.result) {
-                    os.EINTR => {
+                    os.EAGAIN, os.EINTR => {
                         completion.io.enqueue(completion);
                         return;
                     },
                     os.EACCES => error.AccessDenied,
-                    os.EAGAIN => error.WouldBlock,
                     os.EALREADY => error.FastOpenAlreadyInProgress,
                     os.EAFNOSUPPORT => error.AddressFamilyNotSupported,
                     os.EBADF => error.FileDescriptorInvalid,