Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@dev.tarantool.org, gorcunov@gmail.com
Subject: [Tarantool-patches] [PATCH 1/1] txn_limbo: use fiber_clock() instead of fiber_time()
Date: Mon, 20 Jul 2020 23:11:39 +0200	[thread overview]
Message-ID: <917bd68fb91e1d113c65a2c74013371f379243a5.1595279482.git.v.shpilevoy@tarantool.org> (raw)

box.ctl.clear_synchro_queue() used fiber_time()
instead of fiber_clock() to wait for a timeout. This is wrong,
fiber_time() is realtime, not suitable for relative timeouts.

For that purpose always should be used monotonic clock. The patch
fixes that.

Follow up #4849
---
Branch: http://github.com/tarantool/tarantool/tree/gerold103/qsync-fiber_clock
Issue: https://github.com/tarantool/tarantool/issues/4849

 src/box/box.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/box/box.cc b/src/box/box.cc
index 7a7befc32..45340df2e 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -960,9 +960,9 @@ box_clear_synchro_queue(void)
 
 	/* Wait until pending confirmations/rollbacks reach us. */
 	double timeout = 2 * replication_synchro_timeout;
-	double start_tm = fiber_time();
+	double start_tm = fiber_clock();
 	while (!txn_limbo_is_empty(&txn_limbo)) {
-		if (fiber_time() - start_tm > timeout)
+		if (fiber_clock() - start_tm > timeout)
 			break;
 		fiber_sleep(0.001);
 	}
-- 
2.21.1 (Apple Git-122.3)

             reply	other threads:[~2020-07-20 21:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-20 21:11 Vladislav Shpilevoy [this message]
2020-07-20 22:09 ` Cyrill Gorcunov
2020-07-21 20:26   ` 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=917bd68fb91e1d113c65a2c74013371f379243a5.1595279482.git.v.shpilevoy@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 1/1] txn_limbo: use fiber_clock() instead of fiber_time()' \
    /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