Attachment 1355 Details for Bug 1366 – Patch to fix atomicio and atomiciov non-polling spin

[patch] Patch to fix atomicio and atomiciov non-polling spin

openssh-atomicio-polling.patch (text/plain), 1005 bytes, created by Benjamin Bennett on 2007-09-21 04:04:32 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Bennett

Created: 2007-09-21 04:04:32 AEST

Size: 1005 bytes

patch

obsolete

>Index: atomicio.c
>===================================================================
>RCS file: /cvs/openssh/atomicio.c,v
>retrieving revision 1.35
>diff -u -r1.35 atomicio.c
>--- atomicio.c	25 Jun 2007 12:15:12 -0000	1.35
>+++ atomicio.c	15 Sep 2007 22:19:01 -0000
>@@ -57,13 +57,13 @@
> 		res = (f) (fd, s + pos, n - pos);
> 		switch (res) {
> 		case -1:
>-#ifdef EWOULDBLOCK
>-			if (errno == EINTR || errno == EWOULDBLOCK)
>-#else
> 			if (errno == EINTR)
>-#endif
> 				continue;
>+#ifdef EWOULDBLOCK
>+			if (errno == EAGAIN || errno == EWOULDBLOCK) {
>+#else
> 			if (errno == EAGAIN) {
>+#endif
> 				(void)poll(&pfd, 1, -1);
> 				continue;
> 			}
>@@ -103,13 +103,13 @@
> 		res = (f) (fd, iov, iovcnt);
> 		switch (res) {
> 		case -1:
>-#ifdef EWOULDBLOCK
>-			if (errno == EINTR || errno == EWOULDBLOCK)
>-#else
> 			if (errno == EINTR)
>-#endif
> 				continue;
>+#ifdef EWOULDBLOCK
>+			if (errno == EAGAIN || errno == EWOULDBLOCK) {
>+#else
> 			if (errno == EAGAIN) {
>+#endif
> 				(void)poll(&pfd, 1, -1);
> 				continue;
> 			}

Actions: View | Diff

Attachments on bug 1366: 1355