Fix some startup-related glitches.

[srvx.git] / src / ioset.c

diff --git a/src/ioset.c b/src/ioset.c
index a66af6f8b8fbb8badf2db3e20f71fbf4c98693d2..72204135e8388589bfc7094ca2ec2f9bf47e8eb0 100644 (file)
--- a/src/ioset.c
+++ b/src/ioset.c
@@ -93,7 +93,8 @@ extern struct io_engine io_engine_select;
 void
 ioset_init(void)
 {
-    assert(engine == NULL);
+    if (engine) /* someone beat us to it */
+        return;
 
 #if WITH_IOSET_KQUEUE
     if (!engine && io_engine_kqueue.init())
@@ -133,6 +134,8 @@ ioset_add(int fd) {
         log_module(MAIN_LOG, LOG_ERROR, "Somebody called ioset_add(%d) on a negative fd!", fd);
         return 0;
     }
+    if (!engine)
+        ioset_init();
     res = calloc(1, sizeof(*res));
     if (!res)
         return 0;
@@ -269,6 +272,10 @@ ioset_connect(struct sockaddr *local, unsigned int sa_size, const char *peer, un
     return io_fd;
 }
 
+void ioset_update(struct io_fd *fd) {
+    engine->update(fd);
+}
+
 static void
 ioset_try_write(struct io_fd *fd) {
     int res;