projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21d73f3
)
Support for timeout event in yaz_poll_select
author
Dennis Schafroth
<dennis@indexdata.com>
Thu, 20 May 2010 14:26:52 +0000
(16:26 +0200)
committer
Dennis Schafroth
<dennis@indexdata.com>
Thu, 20 May 2010 14:26:52 +0000
(16:26 +0200)
Timeout events does not have a valid file descriptor but is below 0.
src/poll.c
patch
|
blob
|
history
diff --git
a/src/poll.c
b/src/poll.c
index
8c9e354
..
08e5d46
100644
(file)
--- a/
src/poll.c
+++ b/
src/poll.c
@@
-63,6
+63,10
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
enum yaz_poll_mask mask = fds[i].input_mask;
int fd = fds[i].fd;
+ /* Timeout events */
+ if (fd < 0)
+ continue;
+
if (mask & yaz_poll_read)
FD_SET(fd, &input);
if (mask & yaz_poll_write)
@@
-84,8
+88,7
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
int fd = fds[i].fd;
if (!r)
yaz_poll_add(mask, yaz_poll_timeout);
- else
- {
+ else if (fd >= 0) {
if (FD_ISSET(fd, &input))
yaz_poll_add(mask, yaz_poll_read);
if (FD_ISSET(fd, &output))