Merge remote-tracking branch 'IOMultiplexer.git/master' into development

diff --git a/src/IOHandler.c b/src/IOHandler.c
index 81d8d0982fd70c9d8db824427baed4acf7fba361..db9a5998d2f5dc486ad39fa69eb0d050d50cfca0 100644 (file)
--- a/src/IOHandler.c
+++ b/src/IOHandler.c
@@ -706,11 +706,15 @@ void iohandler_events(struct IODescriptor *iofd, int readable, int writeable) {
 }
 
 void iohandler_poll() {
+    struct timeval timeout;
+    timeout.tv_sec = IO_MAX_TIMEOUT;
+    timeout.tv_usec = 0;
+    iohandler_poll_timeout(timeout);
+}
+
+void iohandler_poll_timeout(struct timeval timeout) {
     if(engine) {
         IOSYNCHRONIZE(io_poll_sync); //quite senceless multithread support... better support will follow
-        struct timeval timeout;
-        timeout.tv_sec = IO_MAX_TIMEOUT;
-        timeout.tv_usec = 0;
         engine->loop(&timeout);
         IODESYNCHRONIZE(io_poll_sync);
     }

diff --git a/src/IOHandler.h b/src/IOHandler.h
index 23c411c688a968c9c12102e60bdc378f5af7f6a2..ea7b44396a6d8ea481338f63286e18a5021a982b 100644 (file)
--- a/src/IOHandler.h
+++ b/src/IOHandler.h
@@ -118,5 +118,6 @@ void iohandler_update(struct IODescriptor *iofd);
 void iohandler_set_timeout(struct IODescriptor *iofd, struct timeval *timeout);
 
 void iohandler_poll();
+void iohandler_poll_timeout(struct timeval timeout);
 
 #endif