diff --git a/src/common/multiio.c b/src/common/multiio.c
--- a/src/common/multiio.c
+++ b/src/common/multiio.c
@@ -174,14 +174,14 @@ int multiio_poll_invoke_handlers(struct 
   return TRUE;
 }
 
-int multiio_poll(multiio_context_t context)
+int multiio_poll(multiio_context_t context, int timeout)
 {
   size_t counter;
   struct multiio_poll_travinfo travinfo;
 
   int ret;
 
-  ret = poll(context->pollfds, context->nfds, -1);
+  ret = poll(context->pollfds, context->nfds, timeout);
   if(ret == -1)
     {
       perror("poll");