From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PULL 11/11] replay: assert time only goes forward
Date: Mon, 10 Apr 2017 13:55:24 +0100 [thread overview]
Message-ID: <20170410125524.21008-12-alex.bennee@linaro.org> (raw)
In-Reply-To: <20170410125524.21008-1-alex.bennee@linaro.org>
If we find ourselves trying to add an event to the log where time has
gone backwards it is because a vCPU event has occurred and the
main-loop is not yet aware of time moving forward. This should not
happen and if it does its better to fail early than generate a log
that will have weird behaviour.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/replay/replay-internal.c b/replay/replay-internal.c
index bea7b4aa6b..fca8514012 100644
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@@ -195,6 +195,10 @@ void replay_save_instructions(void)
if (replay_file && replay_mode == REPLAY_MODE_RECORD) {
replay_mutex_lock();
int diff = (int)(replay_get_current_step() - replay_state.current_step);
+
+ /* Time can only go forward */
+ assert(diff >= 0);
+
if (diff > 0) {
replay_put_event(EVENT_INSTRUCTION);
replay_put_dword(diff);
diff --git a/replay/replay.c b/replay/replay.c
index 9e0724e756..f810628cac 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -84,6 +84,10 @@ void replay_account_executed_instructions(void)
if (replay_state.instructions_count > 0) {
int count = (int)(replay_get_current_step()
- replay_state.current_step);
+
+ /* Time can only go forward */
+ assert(count >= 0);
+
replay_state.instructions_count -= count;
replay_state.current_step += count;
if (replay_state.instructions_count == 0) {
--
2.11.0
next prev parent reply other threads:[~2017-04-10 12:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 12:55 [Qemu-devel] [PULL 00/11] Final icount and misc MTTCG fixes for 2.9 Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 01/11] scripts/qemugdb/mtree.py: fix up mtree dump Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 02/11] cpus: fix wrong define name Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 03/11] target/i386/misc_helper: wrap BQL around another IRQ generator Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 04/11] cpus: remove icount handling from qemu_tcg_cpu_thread_fn Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 05/11] cpus: check cpu->running in cpu_get_icount_raw() Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 06/11] cpus: move icount preparation out of tcg_exec_cpu Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 07/11] cpus: don't credit executed instructions before they have run Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 08/11] cpus: introduce cpu_update_icount helper Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 09/11] cpu-exec: update icount after each TB_EXIT Alex Bennée
2017-04-10 12:55 ` [Qemu-devel] [PULL 10/11] cpus: call cpu_update_icount on read Alex Bennée
2017-04-10 12:55 ` Alex Bennée [this message]
2017-04-10 15:08 ` [Qemu-devel] [PULL 00/11] Final icount and misc MTTCG fixes for 2.9 Peter Maydell
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=20170410125524.21008-12-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).