dovecot-2.2: Use io_loop_set_current() instead of directly setti...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Nov 16 21:20:38 EET 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/b740824110f4
changeset: 16964:b740824110f4
user: Timo Sirainen <tss at iki.fi>
date: Sat Nov 16 21:20:31 2013 +0200
description:
Use io_loop_set_current() instead of directly setting it.
diffstat:
src/doveadm/client-connection.c | 4 ++--
src/lib-dict/dict-memcached-ascii.c | 10 +++++-----
src/lib-dict/dict-memcached.c | 4 ++--
src/lib-dict/dict-redis.c | 8 ++++----
src/lib-http/http-client-request.c | 4 ++--
src/lib-http/http-client.c | 4 ++--
src/lib-imap-client/imapc-client.c | 4 ++--
src/lib-sql/driver-pgsql.c | 4 ++--
src/lib-storage/index/pop3c/pop3c-client.c | 4 ++--
src/lib/ioloop.c | 5 ++---
10 files changed, 25 insertions(+), 26 deletions(-)
diffs (202 lines):
diff -r da32044d4fc8 -r b740824110f4 src/doveadm/client-connection.c
--- a/src/doveadm/client-connection.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/doveadm/client-connection.c Sat Nov 16 21:20:31 2013 +0200
@@ -127,10 +127,10 @@
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 -r da32044d4fc8 -r b740824110f4 src/lib-dict/dict-memcached-ascii.c
--- a/src/lib-dict/dict-memcached-ascii.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-dict/dict-memcached-ascii.c Sat Nov 16 21:20:31 2013 +0200
@@ -219,13 +219,13 @@
{
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 @@
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 @@
(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 -r da32044d4fc8 -r b740824110f4 src/lib-dict/dict-memcached.c
--- a/src/lib-dict/dict-memcached.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-dict/dict-memcached.c Sat Nov 16 21:20:31 2013 +0200
@@ -328,9 +328,9 @@
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 -r da32044d4fc8 -r b740824110f4 src/lib-dict/dict-redis.c
--- a/src/lib-dict/dict-redis.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-dict/dict-redis.c Sat Nov 16 21:20:31 2013 +0200
@@ -109,9 +109,9 @@
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 @@
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 -r da32044d4fc8 -r b740824110f4 src/lib-http/http-client-request.c
--- a/src/lib-http/http-client-request.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-http/http-client-request.c Sat Nov 16 21:20:31 2013 +0200
@@ -435,9 +435,9 @@
}
}
- 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 -r da32044d4fc8 -r b740824110f4 src/lib-http/http-client.c
--- a/src/lib-http/http-client.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-http/http-client.c Sat Nov 16 21:20:31 2013 +0200
@@ -199,9 +199,9 @@
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 -r da32044d4fc8 -r b740824110f4 src/lib-imap-client/imapc-client.c
--- a/src/lib-imap-client/imapc-client.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-imap-client/imapc-client.c Sat Nov 16 21:20:31 2013 +0200
@@ -159,7 +159,7 @@
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 @@
array_foreach(&client->conns, connp)
imapc_connection_ioloop_changed((*connp)->conn);
- current_ioloop = ioloop;
+ io_loop_set_current(ioloop);
io_loop_destroy(&ioloop);
}
diff -r da32044d4fc8 -r b740824110f4 src/lib-sql/driver-pgsql.c
--- a/src/lib-sql/driver-pgsql.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-sql/driver-pgsql.c Sat Nov 16 21:20:31 2013 +0200
@@ -86,10 +86,10 @@
/* 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 -r da32044d4fc8 -r b740824110f4 src/lib-storage/index/pop3c/pop3c-client.c
--- a/src/lib-storage/index/pop3c/pop3c-client.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib-storage/index/pop3c/pop3c-client.c Sat Nov 16 21:20:31 2013 +0200
@@ -236,9 +236,9 @@
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 -r da32044d4fc8 -r b740824110f4 src/lib/ioloop.c
--- a/src/lib/ioloop.c Sat Nov 16 21:17:56 2013 +0200
+++ b/src/lib/ioloop.c Sat Nov 16 21:20:31 2013 +0200
@@ -456,8 +456,7 @@
io_loop_default_time_moved;
ioloop->prev = current_ioloop;
- current_ioloop = ioloop;
-
+ io_loop_set_current(ioloop);
return ioloop;
}
@@ -498,7 +497,7 @@
/* ->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);
}
More information about the dovecot-cvs
mailing list