From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 1/4] box/txn: fix void args mess Date: Mon, 17 Feb 2020 18:59:50 +0300 [thread overview] Message-ID: <20200217155953.25803-2-gorcunov@gmail.com> (raw) In-Reply-To: <20200217155953.25803-1-gorcunov@gmail.com> Using void explicitly in functions which take no arguments allows to optimize code a bit and don't assume if there might be variable args. Moreover in commit e070cc4d9 we dropped arguments from txn_begin but didn't update vy_scheduler.c. The compiler didn't complain because it assumed there are vargs. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/txn.c | 14 +++++++------- src/box/txn.h | 4 ++-- src/box/vy_scheduler.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index 30ec586ba..5dadf4985 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -173,7 +173,7 @@ txn_rollback_to_svp(struct txn *txn, struct stailq_entry *svp) * Return a txn from cache or create a new one if cache is empty. */ inline static struct txn * -txn_new() +txn_new(void) { if (!stailq_empty(&txn_cache)) return stailq_shift_entry(&txn_cache, struct txn, in_txn_cache); @@ -209,7 +209,7 @@ txn_free(struct txn *txn) } struct txn * -txn_begin() +txn_begin(void) { static int64_t tsn = 0; assert(! in_txn()); @@ -670,13 +670,13 @@ box_txn_id(void) } bool -box_txn() +box_txn(void) { return in_txn() != NULL; } int -box_txn_begin() +box_txn_begin(void) { if (in_txn()) { diag_set(ClientError, ER_ACTIVE_TRANSACTION); @@ -688,7 +688,7 @@ box_txn_begin() } int -box_txn_commit() +box_txn_commit(void) { struct txn *txn = in_txn(); /** @@ -709,7 +709,7 @@ box_txn_commit() } int -box_txn_rollback() +box_txn_rollback(void) { struct txn *txn = in_txn(); if (txn == NULL) @@ -788,7 +788,7 @@ txn_savepoint_by_name(struct txn *txn, const char *name) } box_txn_savepoint_t * -box_txn_savepoint() +box_txn_savepoint(void) { struct txn *txn = in_txn(); if (txn == NULL) { diff --git a/src/box/txn.h b/src/box/txn.h index 97d7b5de5..ae2c3a58f 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -251,7 +251,7 @@ txn_clear_flag(struct txn *txn, enum txn_flag flag) /* Pointer to the current transaction (if any) */ static inline struct txn * -in_txn() +in_txn(void) { return fiber()->storage.txn; } @@ -261,7 +261,7 @@ in_txn() * @pre no transaction is active */ struct txn * -txn_begin(); +txn_begin(void); /** * Commit a transaction. diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c index 86bed8013..acc909d09 100644 --- a/src/box/vy_scheduler.c +++ b/src/box/vy_scheduler.c @@ -895,7 +895,7 @@ vy_deferred_delete_batch_process_f(struct cmsg *cmsg) deferred_delete_space = space_by_id(BOX_VINYL_DEFERRED_DELETE_ID); assert(deferred_delete_space != NULL); - struct txn *txn = txn_begin(false); + struct txn *txn = txn_begin(); if (txn == NULL) goto fail; -- 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 ` Cyrill Gorcunov [this message] 2020-02-17 17:13 ` [Tarantool-patches] [PATCH 1/4] box/txn: fix void args mess Konstantin Osipov 2020-02-17 15:59 ` [Tarantool-patches] [PATCH 2/4] box/journal: sanitize completion naming Cyrill Gorcunov 2020-02-17 17:14 ` 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-2-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 1/4] box/txn: fix void args mess' \ /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