Attachment 704152 Details for Bug 917007 – Use poll() instead of select().

[patch] Use poll() instead of select().

gamin-use-poll.patch (text/plain), 975 bytes, created by Luke Elliott on 2013-03-01 12:35:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luke Elliott

Created: 2013-03-01 12:35:48 UTC

Size: 975 bytes

patch

obsolete

>diff -aur gamin-0.1.7-orig/libgamin/gam_api.c gamin-0.1.7/libgamin/gam_api.c
>--- gamin-0.1.7-orig/libgamin/gam_api.c	2013-02-28 16:44:13.000000000 +0000
>+++ gamin-0.1.7/libgamin/gam_api.c	2013-02-28 16:55:31.000000000 +0000
>@@ -20,6 +20,8 @@
> #include "gam_fork.h"
> #include "gam_error.h"
> 
>+#include <poll.h>
>+
> #define TEST_DEBUG
> 
> #define MAX_RETRIES 25
>@@ -484,8 +486,7 @@
> static int
> gamin_data_available(int fd)
> {
>-    fd_set read_set;
>-    struct timeval tv;
>+    struct pollfd poll_fd;
>     int avail;
> 
>     if (fd < 0) {
>@@ -495,12 +496,11 @@
>     GAM_DEBUG(DEBUG_INFO, "Checking data available on %d\n", fd);
> 
> retry:
>-    FD_ZERO(&read_set);
>-    FD_SET(fd, &read_set);
>-    tv.tv_sec = 0;
>-    tv.tv_usec = 0;
>+    poll_fd.fd = fd;
>+    poll_fd.events = POLLIN;
>+    poll_fd.revents = 0;
> 
>-    avail = select(fd + 1, &read_set, NULL, NULL, &tv);
>+    avail = poll(&poll_fd, 1, 0);
>     if (avail < 0) {
>         if (errno == EINTR)
>             goto retry;

Actions: View | Diff

Attachments on bug 917007: 704152