[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 12/19] replay: refine replay-time module
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v7 12/19] replay: refine replay-time module |
Date: |
Wed, 10 Oct 2018 16:34:42 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This patch removes refactoring artifacts from the replay/replay-time.c
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
replay/replay-time.c | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/replay/replay-time.c b/replay/replay-time.c
index 17caf35..8986054 100644
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@@ -17,16 +17,15 @@
int64_t replay_save_clock(ReplayClockKind kind, int64_t clock, int64_t
raw_icount)
{
- if (replay_file) {
- g_assert(replay_mutex_locked());
+ g_assert(replay_file);
+ g_assert(replay_mutex_locked());
- /* Due to the caller's locking requirements we get the icount from it
instead
- * of using replay_save_instructions().
- */
- replay_advance_current_step(raw_icount);
- replay_put_event(EVENT_CLOCK + kind);
- replay_put_qword(clock);
- }
+ /* Due to the caller's locking requirements we get the icount from it
instead
+ * of using replay_save_instructions().
+ */
+ replay_advance_current_step(raw_icount);
+ replay_put_event(EVENT_CLOCK + kind);
+ replay_put_qword(clock);
return clock;
}
@@ -48,20 +47,15 @@ void replay_read_next_clock(ReplayClockKind kind)
/*! Reads next clock event from the input. */
int64_t replay_read_clock(ReplayClockKind kind)
{
+ int64_t ret;
g_assert(replay_file && replay_mutex_locked());
replay_account_executed_instructions();
- if (replay_file) {
- int64_t ret;
- if (replay_next_event_is(EVENT_CLOCK + kind)) {
- replay_read_next_clock(kind);
- }
- ret = replay_state.cached_clock[kind];
-
- return ret;
+ if (replay_next_event_is(EVENT_CLOCK + kind)) {
+ replay_read_next_clock(kind);
}
+ ret = replay_state.cached_clock[kind];
- error_report("REPLAY INTERNAL ERROR %d", __LINE__);
- exit(1);
+ return ret;
}
- [Qemu-devel] [PATCH v7 01/19] block: implement bdrv_snapshot_goto for blkreplay, (continued)
- [Qemu-devel] [PATCH v7 01/19] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 02/19] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 03/19] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 04/19] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 05/19] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 06/19] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 07/19] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 08/19] replay: provide and accessor for rr filename, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 09/19] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 11/19] replay: implement replay-seek command to proceed to the desired step, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 12/19] replay: refine replay-time module,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v7 13/19] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 10/19] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 14/19] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 15/19] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 16/19] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 17/19] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 18/19] replay: init rtc after enabling the replay, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 19/19] replay: document development rules, Pavel Dovgalyuk, 2018/10/10