diff --git a/src/common/multiio.h b/src/common/multiio.h
--- a/src/common/multiio.h
+++ b/src/common/multiio.h
@@ -67,11 +67,15 @@ multiio_context_t multiio_context_new();
 int multiio_context_free(multiio_context_t context);
 
 /**
-   Call poll() on the registered sockets and react to events accordingly.
-
-   @param context the context which sockets and handlers were registered with
+ * Call poll() on the registered sockets and react to events accordingly.
+ *
+ * @param context the context which sockets and handlers were registered with
+ *
+ * @param timeout see poll(3p). The number of milliseconds to wait for
+ * a request before returning. 0 for immediate return if no activity
+ * and -1 for waiting until some activity happens before returning.
  */
-int multiio_poll(multiio_context_t context);
+int multiio_poll(multiio_context_t context, int timeout);
 
 /**
    Registers a new socket type/classification for use with this multiio_context.