From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH 3/4] qsync: txn_limbo_wait_complete -- fix type conversion
Date: Tue, 14 Jul 2020 17:44:39 +0300 [thread overview]
Message-ID: <20200714144440.551127-4-gorcunov@gmail.com> (raw)
In-Reply-To: <20200714144440.551127-1-gorcunov@gmail.com>
In txn_limbo_wait_confirm we already use proper int type
(as declared in fiber_cond_wait_timeout) thus lets do the
same here.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
src/box/txn_limbo.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c
index 15dbe6515..d5b887d36 100644
--- a/src/box/txn_limbo.c
+++ b/src/box/txn_limbo.c
@@ -176,12 +176,11 @@ txn_limbo_wait_complete(struct txn_limbo *limbo, struct txn_limbo_entry *entry)
double deadline = start_time + replication_synchro_timeout;
bool cancellable = fiber_set_cancellable(false);
double timeout = deadline - fiber_clock();
- bool timed_out = fiber_cond_wait_timeout(&limbo->wait_cond,
- timeout);
+ int rc = fiber_cond_wait_timeout(&limbo->wait_cond, timeout);
fiber_set_cancellable(cancellable);
if (txn_limbo_entry_is_complete(entry))
goto complete;
- if (timed_out)
+ if (rc != 0)
goto do_rollback;
}
--
2.26.2
next prev parent reply other threads:[~2020-07-14 14:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 14:44 [Tarantool-patches] [PATCH 0/4] qsync: continue cooking the code Cyrill Gorcunov
2020-07-14 14:44 ` [Tarantool-patches] [PATCH 1/4] qsync: add missing functions descriptions Cyrill Gorcunov
2020-07-14 14:44 ` [Tarantool-patches] [PATCH 2/4] qsync: drop txn_limbo_confirm_timeout Cyrill Gorcunov
2020-07-14 14:44 ` Cyrill Gorcunov [this message]
2020-07-14 14:44 ` [Tarantool-patches] [PATCH 4/4] qsync: don't send negative timeouts into fiber_cond_wait_timeout Cyrill Gorcunov
2020-07-14 14:53 ` [Tarantool-patches] [PATCH v2 " Cyrill Gorcunov
2020-07-16 22:45 ` Vladislav Shpilevoy
2020-07-17 7:25 ` Cyrill Gorcunov
2020-07-17 20:03 ` Vladislav Shpilevoy
2020-07-17 20:33 ` Cyrill Gorcunov
2020-07-17 20:43 ` Cyrill Gorcunov
2020-07-20 19:28 ` [Tarantool-patches] [PATCH 0/4] qsync: continue cooking the code Vladislav Shpilevoy
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=20200714144440.551127-4-gorcunov@gmail.com \
--to=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 3/4] qsync: txn_limbo_wait_complete -- fix type conversion' \
/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