Use io_loop_set_current() instead of directly setting it.

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index ddafa4a15fbf0408d66549d765c7e5836392edf1..a12982d751d6befc142ab507fada5e7542a7f28b 100644 (file)
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -127,10 +127,10 @@ doveadm_mail_cmd_server_run(struct client_connection *conn,
        doveadm_print_flush();
        mail_storage_service_deinit(&ctx->storage_service);
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        lib_signals_reset_ioloop();
        o_stream_switch_ioloop(conn->output);
-       current_ioloop = ioloop;
+       io_loop_set_current(ioloop);
        io_loop_destroy(&ioloop);
 
        if (ret < 0) {

diff --git a/src/lib-dict/dict-memcached-ascii.c b/src/lib-dict/dict-memcached-ascii.c
index 275335223e72ddb63bc33594abd42e3277a15dc4..9d957fd48db3d4fce598416f6072f4722e6358f1 100644 (file)
--- a/src/lib-dict/dict-memcached-ascii.c
+++ b/src/lib-dict/dict-memcached-ascii.c
@@ -219,13 +219,13 @@ static int memcached_ascii_input_wait(struct memcached_ascii_dict *dict)
 {
        struct ioloop *old_ioloop = current_ioloop;
 
-       current_ioloop = dict->ioloop;
+       io_loop_set_current(dict->ioloop);
        if (dict->to != NULL)
                dict->to = io_loop_move_timeout(&dict->to);
        connection_switch_ioloop(&dict->conn.conn);
        io_loop_run(dict->ioloop);
 
-       current_ioloop = old_ioloop;
+       io_loop_set_current(old_ioloop);
        if (dict->to != NULL)
                dict->to = io_loop_move_timeout(&dict->to);
        connection_switch_ioloop(&dict->conn.conn);
@@ -406,7 +406,7 @@ memcached_ascii_dict_init(struct dict *driver, const char *uri,
        i_array_init(&dict->replies, 4);
 
        dict->ioloop = io_loop_create();
-       current_ioloop = old_ioloop;
+       io_loop_set_current(old_ioloop);
        *dict_r = &dict->dict;
        return 0;
 }
@@ -421,9 +421,9 @@ static void memcached_ascii_dict_deinit(struct dict *_dict)
                (void)memcached_ascii_wait(dict);
        connection_deinit(&dict->conn.conn);
 
-       current_ioloop = dict->ioloop;
+       io_loop_set_current(dict->ioloop);
        io_loop_destroy(&dict->ioloop);
-       current_ioloop = old_ioloop;
+       io_loop_set_current(old_ioloop);
 
        str_free(&dict->conn.reply_str);
        array_free(&dict->replies);

diff --git a/src/lib-dict/dict-memcached.c b/src/lib-dict/dict-memcached.c
index 5310cbce2acfea04a7eb8fff558c1f3ac5cd0fcd..9b663fb9a0cfd9f449aa4cbd23afd24366c4b83e 100644 (file)
--- a/src/lib-dict/dict-memcached.c
+++ b/src/lib-dict/dict-memcached.c
@@ -328,9 +328,9 @@ memcached_dict_lookup_real(struct memcached_dict *dict, pool_t pool,
                timeout_remove(&to);
        }
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        connection_switch_ioloop(&dict->conn.conn);
-       current_ioloop = dict->ioloop;
+       io_loop_set_current(dict->ioloop);
        io_loop_destroy(&dict->ioloop);
 
        if (!dict->conn.reply.reply_received) {

diff --git a/src/lib-dict/dict-redis.c b/src/lib-dict/dict-redis.c
index 50b085af06f8537b0e1103668257c9fda6bfe829..519d4772e012a36ab3c32d5733020f0c2fd4587b 100644 (file)
--- a/src/lib-dict/dict-redis.c
+++ b/src/lib-dict/dict-redis.c
@@ -109,9 +109,9 @@ static void redis_wait(struct redis_dict *dict)
                io_loop_run(dict->ioloop);
        } while (array_count(&dict->input_states) > 0);
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        connection_switch_ioloop(&dict->conn.conn);
-       current_ioloop = dict->ioloop;
+       io_loop_set_current(dict->ioloop);
        io_loop_destroy(&dict->ioloop);
 }
 
@@ -464,9 +464,9 @@ redis_dict_lookup_real(struct redis_dict *dict, pool_t pool,
                timeout_remove(&to);
        }
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        connection_switch_ioloop(&dict->conn.conn);
-       current_ioloop = dict->ioloop;
+       io_loop_set_current(dict->ioloop);
        io_loop_destroy(&dict->ioloop);
 
        if (!dict->conn.value_received) {

diff --git a/src/lib-http/http-client-request.c b/src/lib-http/http-client-request.c
index 64f8c2fc1b2a7d78bd62ab09b0eaca610421d80c..e941168403a058a52c5f86a078ee4fcb94b74d4d 100644 (file)
--- a/src/lib-http/http-client-request.c
+++ b/src/lib-http/http-client-request.c
@@ -435,9 +435,9 @@ http_client_request_continue_payload(struct http_client_request **_req,
                }
        }
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        http_client_switch_ioloop(client);
-       current_ioloop = client->ioloop;
+       io_loop_set_current(client->ioloop);
        io_loop_destroy(&client->ioloop);
 
        if (req->state == HTTP_REQUEST_STATE_FINISHED)

diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c
index 7760c0488211f269eaf0d03ab69a8bd1f923cb49..39e2d2f007cf8dff6e97bff62b9c71bf732490c6 100644 (file)
--- a/src/lib-http/http-client.c
+++ b/src/lib-http/http-client.c
@@ -199,9 +199,9 @@ void http_client_wait(struct http_client *client)
 
        http_client_debug(client, "All requests finished");
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        http_client_switch_ioloop(client);
-       current_ioloop = client->ioloop;
+       io_loop_set_current(client->ioloop);
        io_loop_destroy(&client->ioloop);
 }
 

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index 6469303f82ea953503fbdeb725677220442259ab..ae5893786fb7d9648e2713ff1ce3f2d7397c0317 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -159,7 +159,7 @@ static void imapc_client_run_pre(struct imapc_client *client)
 
        if (io_loop_is_running(client->ioloop))
                io_loop_run(client->ioloop);
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
 }
 
 static void imapc_client_run_post(struct imapc_client *client)
@@ -171,7 +171,7 @@ static void imapc_client_run_post(struct imapc_client *client)
        array_foreach(&client->conns, connp)
                imapc_connection_ioloop_changed((*connp)->conn);
 
-       current_ioloop = ioloop;
+       io_loop_set_current(ioloop);
        io_loop_destroy(&ioloop);
 }
 

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index 32a0f310d793a225e6460ffad8d03416f6aede56..dff762bd80e79747f3decc67f1c16a6d4f4ae8c2 100644 (file)
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -86,10 +86,10 @@ static void driver_pgsql_set_state(struct pgsql_db *db, enum sql_db_state state)
        /* switch back to original ioloop in case the caller wants to
           add/remove timeouts */
        if (db->ioloop != NULL)
-               current_ioloop = db->orig_ioloop;
+               io_loop_set_current(db->orig_ioloop);
        sql_db_set_state(&db->api, state);
        if (db->ioloop != NULL)
-               current_ioloop = db->ioloop;
+               io_loop_set_current(db->ioloop);
 }
 
 static void driver_pgsql_stop_io(struct pgsql_db *db)

diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c
index a444ff02afade6de9dae41628ac4ef08a9a7dcdc..26c6acf9dfcd007e11bf94f25eecc3e6a5f5290d 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-client.c
+++ b/src/lib-storage/index/pop3c/pop3c-client.c
@@ -236,9 +236,9 @@ void pop3c_client_run(struct pop3c_client *client)
        if (timeout_added && client->to != NULL)
                timeout_remove(&client->to);
 
-       current_ioloop = prev_ioloop;
+       io_loop_set_current(prev_ioloop);
        pop3c_client_ioloop_changed(client);
-       current_ioloop = ioloop;
+       io_loop_set_current(ioloop);
        io_loop_destroy(&ioloop);
 }
 

diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c
index 8d1b429968015bfa32d8908549b45baacd2e7aa4..90666b2dfcac6409c073f2bb6250b5a83e87c175 100644 (file)
--- a/src/lib/ioloop.c
+++ b/src/lib/ioloop.c
@@ -456,8 +456,7 @@ struct ioloop *io_loop_create(void)
                io_loop_default_time_moved;
 
        ioloop->prev = current_ioloop;
-        current_ioloop = ioloop;
-
+        io_loop_set_current(ioloop);
         return ioloop;
 }
 
@@ -498,7 +497,7 @@ void io_loop_destroy(struct ioloop **_ioloop)
 
        /* ->prev won't work unless loops are destroyed in create order */
         i_assert(ioloop == current_ioloop);
-       current_ioloop = current_ioloop->prev;
+       io_loop_set_current(current_ioloop->prev);
 
        i_free(ioloop);
 }