summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-02-08 17:28:27 +0100
committerVolker Lendecke <vlendec@samba.org>2011-02-28 16:40:19 +0100
commit83becbe369bcf3478063662fc2626ccbf4530b20 (patch)
tree0d16172a640f5d5f66ca64da21a9b7b08deb77dc
parent81bdaafab34995522fc9a7b16fcabf9cd09cb528 (diff)
downloadsamba-83becbe369bcf3478063662fc2626ccbf4530b20.tar.gz
samba-83becbe369bcf3478063662fc2626ccbf4530b20.tar.bz2
samba-83becbe369bcf3478063662fc2626ccbf4530b20.zip
s3: Add sys_poll_intr
-rw-r--r--lib/util/select.c26
-rw-r--r--lib/util/select.h1
2 files changed, 27 insertions, 0 deletions
diff --git a/lib/util/select.c b/lib/util/select.c
index b40538c473..5f1c91cff6 100644
--- a/lib/util/select.c
+++ b/lib/util/select.c
@@ -286,3 +286,29 @@ int sys_poll(struct pollfd *fds, int num_fds, int timeout)
return ret;
}
+
+int sys_poll_intr(struct pollfd *fds, int num_fds, int timeout)
+{
+ int orig_timeout = timeout;
+ struct timespec start;
+ int ret;
+
+ clock_gettime_mono(&start);
+
+ while (true) {
+ struct timespec now;
+ int64_t elapsed;
+
+ ret = poll(fds, num_fds, timeout);
+ if (ret != -1) {
+ break;
+ }
+ if (errno != EINTR) {
+ break;
+ }
+ clock_gettime_mono(&now);
+ elapsed = nsec_time_diff(&now, &start);
+ timeout = (orig_timeout - elapsed) / 1000000;
+ };
+ return ret;
+}
diff --git a/lib/util/select.h b/lib/util/select.h
index 795c8fa454..3c762de2ad 100644
--- a/lib/util/select.h
+++ b/lib/util/select.h
@@ -28,5 +28,6 @@ void sys_select_signal(char c);
int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
int sys_poll(struct pollfd *fds, int num_fds, int timeout);
+int sys_poll_intr(struct pollfd *fds, int num_fds, int timeout);
#endif