From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 02/14] box/journal: use plain int for return value Date: Wed, 19 Feb 2020 21:37:01 +0300 [thread overview] Message-ID: <20200219183713.17646-3-gorcunov@gmail.com> (raw) In-Reply-To: <20200219183713.17646-1-gorcunov@gmail.com> We're returning int64_t with values 0 or -1 by now, there is no need for such big return type, plain integer is enough. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/box.cc | 2 +- src/box/journal.c | 2 +- src/box/journal.h | 8 ++++---- src/box/wal.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 1b2b27d61..9e8311d1e 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -310,7 +310,7 @@ struct recovery_journal { * exact same signature during local recovery to properly mark * min/max LSN of created LSM levels. */ -static int64_t +static int recovery_journal_write(struct journal *base, struct journal_entry *entry) { diff --git a/src/box/journal.c b/src/box/journal.c index d762613dd..cf6485642 100644 --- a/src/box/journal.c +++ b/src/box/journal.c @@ -36,7 +36,7 @@ * Used to load from a memtx snapshot. LSN is not used, * but txn_commit() must work. */ -static int64_t +static int dummy_journal_write(struct journal *journal, struct journal_entry *entry) { (void) journal; diff --git a/src/box/journal.h b/src/box/journal.h index 236058bb1..55900d8e5 100644 --- a/src/box/journal.h +++ b/src/box/journal.h @@ -112,8 +112,8 @@ journal_entry_complete(struct journal_entry *entry) * synchronous replication. */ struct journal { - int64_t (*write)(struct journal *journal, - struct journal_entry *req); + int (*write)(struct journal *journal, + struct journal_entry *req); void (*destroy)(struct journal *journal); }; @@ -128,7 +128,7 @@ extern struct journal *current_journal; * * @return 0 if write was scheduled or -1 in case of an error. */ -static inline int64_t +static inline int journal_write(struct journal_entry *entry) { return current_journal->write(current_journal, entry); @@ -165,7 +165,7 @@ journal_set(struct journal *new_journal) static inline void journal_create(struct journal *journal, - int64_t (*write)(struct journal *, struct journal_entry *), + int (*write)(struct journal *, struct journal_entry *), void (*destroy)(struct journal *)) { journal->write = write; diff --git a/src/box/wal.c b/src/box/wal.c index 0ae66ff32..ac977c16e 100644 --- a/src/box/wal.c +++ b/src/box/wal.c @@ -60,10 +60,10 @@ const char *wal_mode_STRS[] = { "none", "write", "fsync", NULL }; int wal_dir_lock = -1; -static int64_t +static int wal_write(struct journal *, struct journal_entry *); -static int64_t +static int wal_write_in_wal_mode_none(struct journal *, struct journal_entry *); /* @@ -1157,7 +1157,7 @@ wal_writer_f(va_list ap) * WAL writer main entry point: queue a single request * to be written to disk. */ -static int64_t +static int wal_write(struct journal *journal, struct journal_entry *entry) { struct wal_writer *writer = (struct wal_writer *) journal; @@ -1213,7 +1213,7 @@ wal_write(struct journal *journal, struct journal_entry *entry) return -1; } -static int64_t +static int wal_write_in_wal_mode_none(struct journal *journal, struct journal_entry *entry) { -- 2.20.1
next prev parent reply other threads:[~2020-02-19 18:37 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-19 18:36 [Tarantool-patches] [PATCH 00/14] rework async and sync transactions Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 01/14] box/txn: fix void args mess Cyrill Gorcunov 2020-02-20 14:10 ` Nikita Pettik 2020-02-20 14:16 ` Cyrill Gorcunov 2020-02-20 14:34 ` Nikita Pettik 2020-02-19 18:37 ` Cyrill Gorcunov [this message] 2020-02-20 14:11 ` [Tarantool-patches] [PATCH 02/14] box/journal: use plain int for return value Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 03/14] box/journal: sanitize completion naming Cyrill Gorcunov 2020-02-20 14:12 ` Nikita Pettik 2020-02-20 14:15 ` Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 04/14] box/txn: rename txn_entry_done_cb to txn_entry_complete_cb Cyrill Gorcunov 2020-02-20 14:15 ` Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 05/14] box/txn: rename txn_write_to_wal to txn_write_to_wal_async Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 06/14] box/journal: supersede journal_write with journal_write_async Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 07/14] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov 2020-02-22 20:28 ` Georgy Kirichenko 2020-02-22 21:00 ` Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 08/14] box/txn: move setup of transaction start time to txn_prepare Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 09/14] box/txn: make txn nop processing a separate routine Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 10/14] box/txn: move journal entry allocation into " Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 11/14] box/txn: merge txn_write_to_wal_async to txn_commit_async Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 12/14] box/txn: do not use journal_write_async under the hood Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 13/14] box/journal: introduce journal_write Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 14/14] box/txn: use journal_write in txn_commit Cyrill Gorcunov 2020-02-19 19:09 ` Konstantin Osipov 2020-02-19 20:01 ` Cyrill Gorcunov
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=20200219183713.17646-3-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 02/14] box/journal: use plain int for return value' \ /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