projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update NEWS
[yaz-moved-to-github.git]
/
src
/
poll.c
diff --git
a/src/poll.c
b/src/poll.c
index
8c9e354
..
f3318f5
100644
(file)
--- a/
src/poll.c
+++ b/
src/poll.c
@@
-1,11
+1,14
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
- * \file
+ * \file
* \brief Select, poll wrapper
*/
* \brief Select, poll wrapper
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <string.h>
#include <assert.h>
#include <string.h>
@@
-57,12
+60,16
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
FD_ZERO(&output);
FD_ZERO(&except);
FD_ZERO(&output);
FD_ZERO(&except);
- assert(num_fds > 0);
+ assert(num_fds >= 0);
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;
int fd = fds[i].fd;
for (i = 0; i < num_fds; i++)
{
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)
if (mask & yaz_poll_read)
FD_SET(fd, &input);
if (mask & yaz_poll_write)
@@
-74,7
+81,7
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
}
tv.tv_sec = sec;
tv.tv_usec = nsec / 1000;
}
tv.tv_sec = sec;
tv.tv_usec = nsec / 1000;
-
+
r = select(max_fd+1, &input, &output, &except, (sec == -1 ? 0 : &tv));
if (r >= 0)
{
r = select(max_fd+1, &input, &output, &except, (sec == -1 ? 0 : &tv));
if (r >= 0)
{
@@
-84,8
+91,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);
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))
if (FD_ISSET(fd, &input))
yaz_poll_add(mask, yaz_poll_read);
if (FD_ISSET(fd, &output))
@@
-102,12
+108,13
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
#if HAVE_SYS_POLL_H
int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
#if HAVE_SYS_POLL_H
int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
- int r;
- struct pollfd *pollfds = (struct pollfd *)
- xmalloc(num_fds * sizeof *pollfds);
- int i;
+ int i, r;
+ struct pollfd *pollfds = 0;
- assert(num_fds > 0);
+ if (num_fds > 0)
+ pollfds = (struct pollfd *) xmalloc(num_fds * sizeof *pollfds);
+
+ assert(num_fds >= 0);
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;
@@
-153,7
+160,7
@@
int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
-#if YAZ_HAVE_SYS_POLL_H
+#if HAVE_SYS_POLL_H
return yaz_poll_poll(fds, num_fds, sec, nsec);
#else
return yaz_poll_select(fds, num_fds, sec, nsec);
return yaz_poll_poll(fds, num_fds, sec, nsec);
#else
return yaz_poll_select(fds, num_fds, sec, nsec);