[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v17 07/21] cpu: replay instructions sequence
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v17 07/21] cpu: replay instructions sequence |
Date: |
Mon, 07 Sep 2015 11:40:48 +0300 |
User-agent: |
StGit/0.16 |
This patch adds calls to replay functions into the icount setup block.
In record mode number of executed instructions is written to the log.
In replay mode number of istructions to execute is taken from the replay log.
When replayed instructions counter is expired qemu_notify_event()
function is called to wake up the iothread.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
cpus.c | 38 +++++++++++++++++++++++++-------------
replay/replay.c | 34 ++++++++++++++++++++++++++++++++++
replay/replay.h | 4 ++++
3 files changed, 63 insertions(+), 13 deletions(-)
diff --git a/cpus.c b/cpus.c
index c1e74d9..ec3f21d 100644
--- a/cpus.c
+++ b/cpus.c
@@ -42,6 +42,7 @@
#include "qemu/seqlock.h"
#include "qapi-event.h"
#include "hw/nmi.h"
+#include "replay/replay.h"
#ifndef _WIN32
#include "qemu/compatfd.h"
@@ -1363,6 +1364,28 @@ int vm_stop_force_state(RunState state)
}
}
+static int64_t tcg_get_icount_limit(void)
+{
+ int64_t deadline;
+
+ if (replay_mode != REPLAY_MODE_PLAY) {
+ deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL);
+
+ /* Maintain prior (possibly buggy) behaviour where if no deadline
+ * was set (as there is no QEMU_CLOCK_VIRTUAL timer) or it is more than
+ * INT32_MAX nanoseconds ahead, we still use INT32_MAX
+ * nanoseconds.
+ */
+ if ((deadline < 0) || (deadline > INT32_MAX)) {
+ deadline = INT32_MAX;
+ }
+
+ return qemu_icount_round(deadline);
+ } else {
+ return replay_get_instructions();
+ }
+}
+
static int tcg_cpu_exec(CPUState *cpu)
{
int ret;
@@ -1375,24 +1398,12 @@ static int tcg_cpu_exec(CPUState *cpu)
#endif
if (use_icount) {
int64_t count;
- int64_t deadline;
int decr;
timers_state.qemu_icount -= (cpu->icount_decr.u16.low
+ cpu->icount_extra);
cpu->icount_decr.u16.low = 0;
cpu->icount_extra = 0;
- deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL);
-
- /* Maintain prior (possibly buggy) behaviour where if no deadline
- * was set (as there is no QEMU_CLOCK_VIRTUAL timer) or it is more than
- * INT32_MAX nanoseconds ahead, we still use INT32_MAX
- * nanoseconds.
- */
- if ((deadline < 0) || (deadline > INT32_MAX)) {
- deadline = INT32_MAX;
- }
-
- count = qemu_icount_round(deadline);
+ count = tcg_get_icount_limit();
timers_state.qemu_icount += count;
decr = (count > 0xffff) ? 0xffff : count;
count -= decr;
@@ -1410,6 +1421,7 @@ static int tcg_cpu_exec(CPUState *cpu)
+ cpu->icount_extra);
cpu->icount_decr.u32 = 0;
cpu->icount_extra = 0;
+ replay_account_executed_instructions();
}
return ret;
}
diff --git a/replay/replay.c b/replay/replay.c
index 7c5af4c..731eec3 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -13,6 +13,7 @@
#include "replay.h"
#include "replay-internal.h"
#include "qemu/timer.h"
+#include "qemu/main-loop.h"
ReplayMode replay_mode = REPLAY_MODE_NONE;
@@ -45,3 +46,36 @@ uint64_t replay_get_current_step(void)
{
return cpu_get_icount_raw();
}
+
+int replay_get_instructions(void)
+{
+ int res = 0;
+ replay_mutex_lock();
+ if (replay_next_event_is(EVENT_INSTRUCTION)) {
+ res = replay_state.instructions_count;
+ }
+ replay_mutex_unlock();
+ return res;
+}
+
+void replay_account_executed_instructions(void)
+{
+ if (replay_mode == REPLAY_MODE_PLAY) {
+ replay_mutex_lock();
+ if (replay_state.instructions_count > 0) {
+ int count = (int)(replay_get_current_step()
+ - replay_state.current_step);
+ replay_state.instructions_count -= count;
+ replay_state.current_step += count;
+ if (replay_state.instructions_count == 0) {
+ assert(replay_data_kind == EVENT_INSTRUCTION);
+ replay_finish_event();
+ /* Wake up iothread. This is required because
+ timers will not expire until clock counters
+ will be read from the log. */
+ qemu_notify_event();
+ }
+ }
+ replay_mutex_unlock();
+ }
+}
diff --git a/replay/replay.h b/replay/replay.h
index a03c748..d19715f 100755
--- a/replay/replay.h
+++ b/replay/replay.h
@@ -22,5 +22,9 @@ extern ReplayMode replay_mode;
/*! Returns number of executed instructions. */
uint64_t replay_get_current_step(void);
+/*! Returns number of instructions to execute in replay mode. */
+int replay_get_instructions(void);
+/*! Updates instructions counter in replay mode. */
+void replay_account_executed_instructions(void);
#endif
- [Qemu-devel] [PATCH v17 00/21] Deterministic replay core, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 01/21] i386: partial revert of interrupt poll fix, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 02/21] replay: global variables and function stubs, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 03/21] replay: internal functions for replay log, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 04/21] replay: introduce mutex to protect the replay log, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 05/21] replay: introduce icount event, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 06/21] cpu-exec: allow temporary disabling icount, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 07/21] cpu: replay instructions sequence,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v17 08/21] i386: interrupt poll processing, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 09/21] replay: interrupts and exceptions, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 10/21] replay: asynchronous events infrastructure, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 11/21] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 12/21] replay: shutdown event, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 13/21] icount: improve counting for record/replay, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 14/21] replay: checkpoints, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 15/21] bottom halves: introduce bh call function, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 16/21] replay: ptimer, Pavel Dovgalyuk, 2015/09/07
- [Qemu-devel] [PATCH v17 19/21] replay: replay blockers for devices, Pavel Dovgalyuk, 2015/09/07