From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 2/4] box/journal: sanitize completion naming Date: Mon, 17 Feb 2020 18:59:51 +0300 [thread overview] Message-ID: <20200217155953.25803-3-gorcunov@gmail.com> (raw) In-Reply-To: <20200217155953.25803-1-gorcunov@gmail.com> 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. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- 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 d762613dd..c9c0ac475 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 236058bb1..071618496 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
next prev parent reply other threads:[~2020-02-17 16:00 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-17 15:59 [Tarantool-patches] [PATCH 0/4] box/txn: fix nil dereference on txn error path Cyrill Gorcunov 2020-02-17 15:59 ` [Tarantool-patches] [PATCH 1/4] box/txn: fix void args mess Cyrill Gorcunov 2020-02-17 17:13 ` Konstantin Osipov 2020-02-17 15:59 ` Cyrill Gorcunov [this message] 2020-02-17 17:14 ` [Tarantool-patches] [PATCH 2/4] box/journal: sanitize completion naming Konstantin Osipov 2020-02-17 15:59 ` [Tarantool-patches] [PATCH 3/4] box/txn: rename txn_entry_done_cb to txn_entry_complete_cb Cyrill Gorcunov 2020-02-17 17:14 ` Konstantin Osipov 2020-02-17 15:59 ` [Tarantool-patches] [PATCH 4/4] box/txn: fix nil dereference in txn_rollback Cyrill Gorcunov 2020-02-17 17:19 ` Konstantin Osipov 2020-02-17 19:05 ` Cyrill Gorcunov 2020-02-17 20:01 ` Konstantin Osipov 2020-02-17 20:01 ` Konstantin Osipov 2020-02-17 20:05 ` Cyrill Gorcunov 2020-02-17 20:34 ` Cyrill Gorcunov 2020-02-17 17:25 ` Georgy Kirichenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200217155953.25803-3-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/4] box/journal: sanitize completion naming' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox