lib: istream: Allow switching to a specific ioloop.

diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c
index a332feed8eeb324d00b658fc2898085761788909..c922bb42d84df5cac9d785ecede2fb9d0cbc01db 100644 (file)
--- a/src/lib-http/http-server-request.c
+++ b/src/lib-http/http-server-request.c
@@ -461,7 +461,8 @@ struct http_server_istream {
 };
 
 static void
-http_server_istream_switch_ioloop(struct istream_private *stream)
+http_server_istream_switch_ioloop_to(struct istream_private *stream,
+                                    struct ioloop *ioloop)
 {
        struct http_server_istream *hsristream =
                (struct http_server_istream *)stream;
@@ -469,6 +470,7 @@ http_server_istream_switch_ioloop(struct istream_private *stream)
        if (hsristream->istream.istream.blocking)
                return;
 
+       i_assert(ioloop == current_ioloop);
        http_server_connection_switch_ioloop(hsristream->req->conn);
 }
 
@@ -581,7 +583,7 @@ http_server_request_get_payload_input(struct http_server_request *req,
        hsristream->istream.stream_size_passthrough = TRUE;
 
        hsristream->istream.read = http_server_istream_read;
-       hsristream->istream.switch_ioloop = http_server_istream_switch_ioloop;
+       hsristream->istream.switch_ioloop_to = http_server_istream_switch_ioloop_to;
        hsristream->istream.iostream.destroy = http_server_istream_destroy;
 
        hsristream->istream.istream.readable_fd = FALSE;

diff --git a/src/lib/istream-multiplex.c b/src/lib/istream-multiplex.c
index ec024d4deb145a77a854fc707e7c6fcaf3c543ac..13eae8c3ca65021ce6b5d0245959463f48c1c695 100644 (file)
--- a/src/lib/istream-multiplex.c
+++ b/src/lib/istream-multiplex.c
@@ -189,11 +189,12 @@ static ssize_t i_stream_multiplex_ichannel_read(struct istream_private *stream)
 }
 
 static void
-i_stream_multiplex_ichannel_switch_ioloop(struct istream_private *stream)
+i_stream_multiplex_ichannel_switch_ioloop_to(struct istream_private *stream,
+                                            struct ioloop *ioloop)
 {
        struct multiplex_ichannel *channel = (struct multiplex_ichannel*)stream;
 
-       i_stream_switch_ioloop(channel->mstream->parent);
+       i_stream_switch_ioloop_to(channel->mstream->parent, ioloop);
 }
 
 static void
@@ -244,7 +245,7 @@ i_stream_add_channel_real(struct multiplex_istream *mstream, uint8_t cid)
        channel->cid = cid;
        channel->mstream = mstream;
        channel->istream.read = i_stream_multiplex_ichannel_read;
-       channel->istream.switch_ioloop = i_stream_multiplex_ichannel_switch_ioloop;
+       channel->istream.switch_ioloop_to = i_stream_multiplex_ichannel_switch_ioloop_to;
        channel->istream.iostream.close = i_stream_multiplex_ichannel_close;
        channel->istream.iostream.destroy = i_stream_multiplex_ichannel_destroy;
        channel->istream.max_buffer_size = mstream->bufsize;

diff --git a/src/lib/istream-private.h b/src/lib/istream-private.h
index fd53da974dd25a92f425cb7e186d275abb639dad..641e7a0e2c640fcccd60b727a459e16a2ab71ee4 100644 (file)
--- a/src/lib/istream-private.h
+++ b/src/lib/istream-private.h
@@ -19,7 +19,8 @@ struct istream_private {
        void (*sync)(struct istream_private *stream);
        int (*stat)(struct istream_private *stream, bool exact);
        int (*get_size)(struct istream_private *stream, bool exact, uoff_t *size_r);
-       void (*switch_ioloop)(struct istream_private *stream);
+       void (*switch_ioloop_to)(struct istream_private *stream,
+                                struct ioloop *ioloop);
        struct istream_snapshot *
                (*snapshot)(struct istream_private *stream,
                            struct istream_snapshot *prev_snapshot);

diff --git a/src/lib/istream-timeout.c b/src/lib/istream-timeout.c
index a7b1fd623067ef5f0678a97a9462299a95c93ff5..d7d8f98bb4202a6ef197e885f9a7284f16a7dbdd 100644 (file)
--- a/src/lib/istream-timeout.c
+++ b/src/lib/istream-timeout.c
@@ -27,16 +27,18 @@ static void i_stream_timeout_close(struct iostream_private *stream,
                i_stream_close(tstream->istream.parent);
 }
 
-static void i_stream_timeout_switch_ioloop(struct istream_private *stream)
+static void i_stream_timeout_switch_ioloop_to(struct istream_private *stream,
+                                             struct ioloop *ioloop)
 {
        struct timeout_istream *tstream = (struct timeout_istream *)stream;
 
        if (tstream->to != NULL)
-               tstream->to = io_loop_move_timeout(&tstream->to);
+               tstream->to = io_loop_move_timeout_to(ioloop, &tstream->to);
 }
 
 static void i_stream_timeout(struct timeout_istream *tstream)
 {
+       struct iostream_private *iostream = &tstream->istream.iostream;
        unsigned int over_msecs;
        int diff;
 
@@ -54,8 +56,9 @@ static void i_stream_timeout(struct timeout_istream *tstream)
                /* we haven't reached the read timeout yet, update it */
                if (diff < 0)
                        diff = 0;
-               tstream->to = timeout_add(tstream->timeout_msecs - diff,
-                                         i_stream_timeout, tstream);
+               tstream->to = timeout_add_to(io_stream_get_ioloop(iostream),
+                                            tstream->timeout_msecs - diff,
+                                            i_stream_timeout, tstream);
                return;
        }
        over_msecs = diff - tstream->timeout_msecs;
@@ -86,6 +89,7 @@ static ssize_t
 i_stream_timeout_read(struct istream_private *stream)
 {
        struct timeout_istream *tstream = (struct timeout_istream *)stream;
+       struct iostream_private *iostream = &tstream->istream.iostream;
        ssize_t ret;
 
        i_stream_seek(stream->parent, stream->parent_start_offset +
@@ -105,8 +109,9 @@ i_stream_timeout_read(struct istream_private *stream)
                /* first read. add the timeout here instead of in init
                   in case the stream is created long before it's actually
                   read from. */
-               tstream->to = timeout_add(tstream->timeout_msecs,
-                                         i_stream_timeout, tstream);
+               tstream->to = timeout_add_to(io_stream_get_ioloop(iostream),
+                                            tstream->timeout_msecs,
+                                            i_stream_timeout, tstream);
                i_stream_timeout_set_pending(tstream);
        } else if (ret > 0 && tstream->to != NULL) {
                /* we read something, reset the timeout */
@@ -131,7 +136,7 @@ i_stream_create_timeout(struct istream *input, unsigned int timeout_msecs)
        tstream->created = ioloop_time;
 
        tstream->istream.read = i_stream_timeout_read;
-       tstream->istream.switch_ioloop = i_stream_timeout_switch_ioloop;
+       tstream->istream.switch_ioloop_to = i_stream_timeout_switch_ioloop_to;
        tstream->istream.iostream.close = i_stream_timeout_close;
 
        tstream->istream.istream.readable_fd = input->readable_fd;

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 9f14e4ee4d2ef6ab25a93a104c2c9dcc00c4a5f7..57a295cd460f59bfc4d0c9b9d8e59d403012954a 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -920,18 +920,24 @@ void i_stream_set_input_pending(struct istream *stream, bool pending)
                io_set_pending(stream->real_stream->io);
 }
 
-void i_stream_switch_ioloop(struct istream *stream)
+void i_stream_switch_ioloop_to(struct istream *stream, struct ioloop *ioloop)
 {
-       io_stream_switch_ioloop_to(&stream->real_stream->iostream,
-                                  current_ioloop);
+       io_stream_switch_ioloop_to(&stream->real_stream->iostream, ioloop);
 
        do {
-               if (stream->real_stream->switch_ioloop != NULL)
-                       stream->real_stream->switch_ioloop(stream->real_stream);
+               if (stream->real_stream->switch_ioloop_to != NULL) {
+                       stream->real_stream->switch_ioloop_to(
+                               stream->real_stream, ioloop);
+               }
                stream = stream->real_stream->parent;
        } while (stream != NULL);
 }
 
+void i_stream_switch_ioloop(struct istream *stream)
+{
+       i_stream_switch_ioloop_to(stream, current_ioloop);
+}
+
 void i_stream_set_io(struct istream *stream, struct io *io)
 {
        while (stream->real_stream->parent != NULL) {

diff --git a/src/lib/istream.h b/src/lib/istream.h
index caed38b03adb2fcdfb76a5dc0bd970f8f5eed8a4..4dcaa5216cb78c5fcc1730ab696ab1fc85ed5dfd 100644 (file)
--- a/src/lib/istream.h
+++ b/src/lib/istream.h
@@ -4,6 +4,8 @@
 /* Note that some systems (Solaris) may use a macro to redefine struct stat */
 #include <sys/stat.h>
 
+struct ioloop;
+
 struct istream {
        uoff_t v_offset;
 
@@ -235,7 +237,8 @@ bool i_stream_add_data(struct istream *stream, const unsigned char *data,
 void i_stream_set_input_pending(struct istream *stream, bool pending);
 
 /* If there are any I/O loop items associated with the stream, move all of
-   them to current_ioloop. */
+   them to provided/current ioloop. */
+void i_stream_switch_ioloop_to(struct istream *stream, struct ioloop *ioloop);
 void i_stream_switch_ioloop(struct istream *stream);
 
 #endif