dovecot-2.2: dsync: Renamed "slave" to "ibc" (= inter-brain comm...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Sep 7 16:45:05 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/920756cd29b8
changeset: 15037:920756cd29b8
user: Timo Sirainen <tss at iki.fi>
date: Fri Sep 07 16:43:44 2012 +0300
description:
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
diffstat:
src/doveadm/dsync/Makefile.am | 10 +-
src/doveadm/dsync/doveadm-dsync.c | 36 +-
src/doveadm/dsync/dsync-brain-mailbox-tree.c | 28 +-
src/doveadm/dsync/dsync-brain-mailbox.c | 12 +-
src/doveadm/dsync/dsync-brain-mails.c | 48 +-
src/doveadm/dsync/dsync-brain-private.h | 2 +-
src/doveadm/dsync/dsync-brain.c | 72 +-
src/doveadm/dsync/dsync-brain.h | 6 +-
src/doveadm/dsync/dsync-ibc-pipe.c | 482 ++++++++
src/doveadm/dsync/dsync-ibc-private.h | 78 +
src/doveadm/dsync/dsync-ibc-stream.c | 1517 +++++++++++++++++++++++++
src/doveadm/dsync/dsync-ibc.c | 200 +++
src/doveadm/dsync/dsync-ibc.h | 118 ++
src/doveadm/dsync/dsync-slave-pipe.c | 485 --------
src/doveadm/dsync/dsync-slave-private.h | 78 -
src/doveadm/dsync/dsync-slave-stream.c | 1522 --------------------------
src/doveadm/dsync/dsync-slave.c | 202 ---
src/doveadm/dsync/dsync-slave.h | 118 --
18 files changed, 2502 insertions(+), 2512 deletions(-)
diffs (truncated from 5526 to 300 lines):
diff -r 5943cace4e05 -r 920756cd29b8 src/doveadm/dsync/Makefile.am
--- a/src/doveadm/dsync/Makefile.am Fri Sep 07 16:19:35 2012 +0300
+++ b/src/doveadm/dsync/Makefile.am Fri Sep 07 16:43:44 2012 +0300
@@ -27,9 +27,9 @@
dsync-mailbox-tree-fill.c \
dsync-mailbox-tree-sync.c \
dsync-serializer.c \
- dsync-slave.c \
- dsync-slave-stream.c \
- dsync-slave-pipe.c \
+ dsync-ibc.c \
+ dsync-ibc-stream.c \
+ dsync-ibc-pipe.c \
dsync-transaction-log-scan.c
noinst_HEADERS = \
@@ -46,8 +46,8 @@
dsync-mailbox-tree-private.h \
dsync-serializer.h \
dsync-deserializer.h \
- dsync-slave.h \
- dsync-slave-private.h \
+ dsync-ibc.h \
+ dsync-ibc-private.h \
dsync-transaction-log-scan.h
test_programs = \
diff -r 5943cace4e05 -r 920756cd29b8 src/doveadm/dsync/doveadm-dsync.c
--- a/src/doveadm/dsync/doveadm-dsync.c Fri Sep 07 16:19:35 2012 +0300
+++ b/src/doveadm/dsync/doveadm-dsync.c Fri Sep 07 16:43:44 2012 +0300
@@ -15,7 +15,7 @@
#include "doveadm-settings.h"
#include "doveadm-mail.h"
#include "dsync-brain.h"
-#include "dsync-slave.h"
+#include "dsync-ibc.h"
#include "doveadm-dsync.h"
#include <stdio.h>
@@ -228,7 +228,7 @@
static int
cmd_dsync_run_local(struct dsync_cmd_context *ctx, struct mail_user *user,
- struct dsync_brain *brain, struct dsync_slave *slave2)
+ struct dsync_brain *brain, struct dsync_ibc *ibc2)
{
struct dsync_brain *brain2;
struct mail_user *user2;
@@ -267,7 +267,7 @@
"points to same directory: %s", path1);
}
- brain2 = dsync_brain_slave_init(user2, slave2);
+ brain2 = dsync_brain_slave_init(user2, ibc2);
brain1_running = brain2_running = TRUE;
changed1 = changed2 = TRUE;
@@ -312,7 +312,7 @@
cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
{
struct dsync_cmd_context *ctx = (struct dsync_cmd_context *)_ctx;
- struct dsync_slave *slave, *slave2 = NULL;
+ struct dsync_ibc *ibc, *ibc2 = NULL;
struct dsync_brain *brain;
struct mail_namespace *sync_ns = NULL;
int ret = 0;
@@ -330,26 +330,26 @@
}
if (!ctx->remote)
- dsync_slave_init_pipe(&slave, &slave2);
+ dsync_ibc_init_pipe(&ibc, &ibc2);
else {
string_t *temp_prefix = t_str_new(64);
mail_user_set_get_temp_prefix(temp_prefix, user->set);
- slave = dsync_slave_init_stream(ctx->fd_in, ctx->fd_out,
- ctx->remote_name,
- str_c(temp_prefix));
+ ibc = dsync_ibc_init_stream(ctx->fd_in, ctx->fd_out,
+ ctx->remote_name,
+ str_c(temp_prefix));
}
if (doveadm_debug || doveadm_verbose) {
// FIXME
}
- brain = dsync_brain_master_init(user, slave, sync_ns,
+ brain = dsync_brain_master_init(user, ibc, sync_ns,
ctx->sync_type,
DSYNC_BRAIN_FLAG_MAILS_HAVE_GUIDS |
DSYNC_BRAIN_FLAG_SEND_REQUESTS,
"");
if (!ctx->remote) {
- if (cmd_dsync_run_local(ctx, user, brain, slave2) < 0)
+ if (cmd_dsync_run_local(ctx, user, brain, ibc2) < 0)
_ctx->exit_code = EX_TEMPFAIL;
} else {
cmd_dsync_run_remote(user);
@@ -357,9 +357,9 @@
if (dsync_brain_deinit(&brain) < 0)
_ctx->exit_code = EX_TEMPFAIL;
- dsync_slave_deinit(&slave);
- if (slave2 != NULL)
- dsync_slave_deinit(&slave2);
+ dsync_ibc_deinit(&ibc);
+ if (ibc2 != NULL)
+ dsync_ibc_deinit(&ibc2);
if (ctx->io_err != NULL)
io_remove(&ctx->io_err);
if (ctx->fd_err != -1)
@@ -507,7 +507,7 @@
cmd_dsync_server_run(struct doveadm_mail_cmd_context *_ctx ATTR_UNUSED,
struct mail_user *user)
{
- struct dsync_slave *slave;
+ struct dsync_ibc *ibc;
struct dsync_brain *brain;
string_t *temp_prefix;
@@ -520,13 +520,13 @@
temp_prefix = t_str_new(64);
mail_user_set_get_temp_prefix(temp_prefix, user->set);
- slave = dsync_slave_init_stream(STDIN_FILENO, STDOUT_FILENO,
- "local", str_c(temp_prefix));
- brain = dsync_brain_slave_init(user, slave);
+ ibc = dsync_ibc_init_stream(STDIN_FILENO, STDOUT_FILENO,
+ "local", str_c(temp_prefix));
+ brain = dsync_brain_slave_init(user, ibc);
io_loop_run(current_ioloop);
- dsync_slave_deinit(&slave);
+ dsync_ibc_deinit(&ibc);
return dsync_brain_deinit(&brain);
}
diff -r 5943cace4e05 -r 920756cd29b8 src/doveadm/dsync/dsync-brain-mailbox-tree.c
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree.c Fri Sep 07 16:19:35 2012 +0300
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree.c Fri Sep 07 16:43:44 2012 +0300
@@ -5,7 +5,7 @@
#include "settings-parser.h"
#include "mail-namespace.h"
#include "doveadm-settings.h"
-#include "dsync-slave.h"
+#include "dsync-ibc.h"
#include "dsync-mailbox-tree.h"
#include "dsync-brain-private.h"
@@ -94,7 +94,7 @@
void dsync_brain_send_mailbox_tree(struct dsync_brain *brain)
{
struct dsync_mailbox_node *node;
- enum dsync_slave_send_ret ret;
+ enum dsync_ibc_send_ret ret;
const char *full_name;
char sep[2];
@@ -105,14 +105,14 @@
const char *const *parts;
parts = t_strsplit(full_name, sep);
- ret = dsync_slave_send_mailbox_tree_node(brain->slave,
- parts, node);
+ ret = dsync_ibc_send_mailbox_tree_node(brain->ibc,
+ parts, node);
} T_END;
- if (ret == DSYNC_SLAVE_SEND_RET_FULL)
+ if (ret == DSYNC_IBC_SEND_RET_FULL)
return;
}
dsync_mailbox_tree_iter_deinit(&brain->local_tree_iter);
- dsync_slave_send_end_of_list(brain->slave);
+ dsync_ibc_send_end_of_list(brain->ibc);
brain->state = DSYNC_STATE_SEND_MAILBOX_TREE_DELETES;
}
@@ -124,8 +124,8 @@
deletes = dsync_mailbox_tree_get_deletes(brain->local_mailbox_tree,
&count);
- dsync_slave_send_mailbox_deletes(brain->slave, deletes, count,
- brain->hierarchy_sep);
+ dsync_ibc_send_mailbox_deletes(brain->ibc, deletes, count,
+ brain->hierarchy_sep);
brain->state = DSYNC_STATE_RECV_MAILBOX_TREE;
}
@@ -289,12 +289,12 @@
struct dsync_mailbox_node *node;
const char *const *parts, *name;
struct mail_namespace *ns;
- enum dsync_slave_recv_ret ret;
+ enum dsync_ibc_recv_ret ret;
char sep[2];
bool changed = FALSE;
- while ((ret = dsync_slave_recv_mailbox_tree_node(brain->slave, &parts,
- &remote_node)) > 0) {
+ while ((ret = dsync_ibc_recv_mailbox_tree_node(brain->ibc, &parts,
+ &remote_node)) > 0) {
if (dsync_get_mailbox_name(brain, parts, &name, &ns) < 0) {
sep[0] = brain->hierarchy_sep; sep[1] = '\0';
i_error("Couldn't find namespace for mailbox %s",
@@ -306,7 +306,7 @@
node->ns = ns;
dsync_mailbox_node_copy_data(node, remote_node);
}
- if (ret == DSYNC_SLAVE_RECV_RET_FINISHED) {
+ if (ret == DSYNC_IBC_RECV_RET_FINISHED) {
if (dsync_mailbox_tree_build_guid_hash(brain->remote_mailbox_tree) < 0)
brain->failed = TRUE;
@@ -369,8 +369,8 @@
unsigned int i, count;
char sep;
- if (dsync_slave_recv_mailbox_deletes(brain->slave, &deletes, &count,
- &sep) == 0)
+ if (dsync_ibc_recv_mailbox_deletes(brain->ibc, &deletes, &count,
+ &sep) == 0)
return FALSE;
/* apply remote's mailbox deletions based on our local tree */
diff -r 5943cace4e05 -r 920756cd29b8 src/doveadm/dsync/dsync-brain-mailbox.c
--- a/src/doveadm/dsync/dsync-brain-mailbox.c Fri Sep 07 16:19:35 2012 +0300
+++ b/src/doveadm/dsync/dsync-brain-mailbox.c Fri Sep 07 16:43:44 2012 +0300
@@ -6,7 +6,7 @@
#include "mail-cache-private.h"
#include "mail-namespace.h"
#include "mail-storage-private.h"
-#include "dsync-slave.h"
+#include "dsync-ibc.h"
#include "dsync-mailbox-tree.h"
#include "dsync-mailbox-import.h"
#include "dsync-mailbox-export.h"
@@ -370,12 +370,12 @@
if (!dsync_brain_next_mailbox(brain, &box, &dsync_box)) {
brain->state = DSYNC_STATE_DONE;
- dsync_slave_send_end_of_list(brain->slave);
+ dsync_ibc_send_end_of_list(brain->ibc);
return;
}
/* start exporting this mailbox (wait for remote to start importing) */
- dsync_slave_send_mailbox(brain->slave, &dsync_box);
+ dsync_ibc_send_mailbox(brain->ibc, &dsync_box);
(void)dsync_brain_sync_mailbox_init(brain, box, &dsync_box,
DSYNC_BOX_STATE_MAILBOX);
brain->state = DSYNC_STATE_SYNC_MAILS;
@@ -526,7 +526,7 @@
i_assert(!brain->master_brain);
i_assert(brain->box == NULL);
- if ((ret = dsync_slave_recv_mailbox(brain->slave, &dsync_box)) == 0)
+ if ((ret = dsync_ibc_recv_mailbox(brain->ibc, &dsync_box)) == 0)
return FALSE;
if (ret < 0) {
brain->state = DSYNC_STATE_DONE;
@@ -563,13 +563,13 @@
memcpy(delete_box.mailbox_guid, dsync_box->mailbox_guid,
sizeof(delete_box.mailbox_guid));
delete_box.mailbox_lost = TRUE;
- dsync_slave_send_mailbox(brain->slave, &delete_box);
+ dsync_ibc_send_mailbox(brain->ibc, &delete_box);
return TRUE;
}
i_assert(local_dsync_box.uid_validity != 0);
i_assert(memcmp(dsync_box->mailbox_guid, local_dsync_box.mailbox_guid,
sizeof(dsync_box->mailbox_guid)) == 0);
- dsync_slave_send_mailbox(brain->slave, &local_dsync_box);
+ dsync_ibc_send_mailbox(brain->ibc, &local_dsync_box);
dsync_brain_mailbox_update_pre(brain, box, &local_dsync_box, dsync_box);
diff -r 5943cace4e05 -r 920756cd29b8 src/doveadm/dsync/dsync-brain-mails.c
--- a/src/doveadm/dsync/dsync-brain-mails.c Fri Sep 07 16:19:35 2012 +0300
+++ b/src/doveadm/dsync/dsync-brain-mails.c Fri Sep 07 16:43:44 2012 +0300
@@ -2,7 +2,7 @@
#include "lib.h"
#include "istream.h"
-#include "dsync-slave.h"
+#include "dsync-ibc.h"
#include "dsync-mail.h"
#include "dsync-mailbox-import.h"
#include "dsync-mailbox-export.h"
@@ -11,13 +11,13 @@
static bool dsync_brain_master_sync_recv_mailbox(struct dsync_brain *brain)
{
const struct dsync_mailbox *dsync_box;
- enum dsync_slave_recv_ret ret;
+ enum dsync_ibc_recv_ret ret;
i_assert(brain->master_brain);
- if ((ret = dsync_slave_recv_mailbox(brain->slave, &dsync_box)) == 0)
More information about the dovecot-cvs
mailing list