[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 13/25] replay: refine replay-time module
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v6 13/25] replay: refine replay-time module |
Date: |
Wed, 12 Sep 2018 11:19:05 +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 v6 05/25] replay: finish record/replay before closing the disks, (continued)
- [Qemu-devel] [PATCH v6 05/25] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 06/25] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 07/25] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 08/25] replay: provide and accessor for rr filename, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 09/25] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 10/25] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 11/25] replay: implement replay-seek command to proceed to the desired step, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 14/25] translator: fix breakpoint processing, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 12/25] replay: flush events when exiting, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 15/25] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 13/25] replay: refine replay-time module,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v6 16/25] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 17/25] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 18/25] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 19/25] replay: allow loading any snapshots before recording, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 20/25] replay: wake up vCPU when replaying, Pavel Dovgalyuk, 2018/09/12
- [Qemu-devel] [PATCH v6 21/25] replay: replay BH for IDE trim operation, Pavel Dovgalyuk, 2018/09/12