From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 9E8EE4696C5 for ; Wed, 19 Feb 2020 21:37:51 +0300 (MSK) Received: by mail-lj1-f196.google.com with SMTP id q8so1460369ljb.2 for ; Wed, 19 Feb 2020 10:37:51 -0800 (PST) From: Cyrill Gorcunov Date: Wed, 19 Feb 2020 21:37:02 +0300 Message-Id: <20200219183713.17646-4-gorcunov@gmail.com> In-Reply-To: <20200219183713.17646-1-gorcunov@gmail.com> References: <20200219183713.17646-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 03/14] box/journal: sanitize completion naming List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Instead of on_done use on_complete prefix since done it too general while we're trying to complete write procedue. Also it is more consistent with txn_complete name. Acked-by: Konstantin Osipov Signed-off-by: Cyrill Gorcunov --- src/box/journal.c | 8 ++++---- src/box/journal.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/box/journal.c b/src/box/journal.c index cf6485642..11e78990d 100644 --- a/src/box/journal.c +++ b/src/box/journal.c @@ -54,8 +54,8 @@ struct journal *current_journal = &dummy_journal; struct journal_entry * journal_entry_new(size_t n_rows, struct region *region, - journal_entry_done_cb on_done_cb, - void *on_done_cb_data) + journal_entry_complete_cb on_complete_cb, + void *on_complete_cb_data) { struct journal_entry *entry; @@ -71,8 +71,8 @@ journal_entry_new(size_t n_rows, struct region *region, entry->approx_len = 0; entry->n_rows = n_rows; entry->res = -1; - entry->on_done_cb = on_done_cb; - entry->on_done_cb_data = on_done_cb_data; + entry->on_complete_cb = on_complete_cb; + entry->on_complete_cb_data = on_complete_cb_data; return entry; } diff --git a/src/box/journal.h b/src/box/journal.h index 55900d8e5..64f167c6f 100644 --- a/src/box/journal.h +++ b/src/box/journal.h @@ -43,7 +43,7 @@ struct xrow_header; struct journal_entry; /** Journal entry finalization callback typedef. */ -typedef void (*journal_entry_done_cb)(struct journal_entry *entry, void *data); +typedef void (*journal_entry_complete_cb)(struct journal_entry *entry, void *data); /** * An entry for an abstract journal. @@ -66,11 +66,11 @@ struct journal_entry { * or fail. Entry->res is set to a result value before the callback * is fired. */ - journal_entry_done_cb on_done_cb; + journal_entry_complete_cb on_complete_cb; /** * A journal entry completion callback argument. */ - void *on_done_cb_data; + void *on_complete_cb_data; /** * Approximate size of this request when encoded. */ @@ -94,8 +94,8 @@ struct region; */ struct journal_entry * journal_entry_new(size_t n_rows, struct region *region, - journal_entry_done_cb on_done_cb, - void *on_done_cb_data); + journal_entry_complete_cb on_complete_cb, + void *on_complete_cb_data); /** * Finalize a single entry. @@ -103,7 +103,7 @@ journal_entry_new(size_t n_rows, struct region *region, static inline void journal_entry_complete(struct journal_entry *entry) { - entry->on_done_cb(entry, entry->on_done_cb_data); + entry->on_complete_cb(entry, entry->on_complete_cb_data); } /** -- 2.20.1