[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v14 14/25] replay: refine replay-time module
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v14 14/25] replay: refine replay-time module |
Date: |
Fri, 15 Mar 2019 15:09:38 +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 | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/replay/replay-time.c b/replay/replay-time.c
index 0df1693337..60f47b73a7 100644
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@@ -15,18 +15,19 @@
#include "replay-internal.h"
#include "qemu/error-report.h"
-int64_t replay_save_clock(ReplayClockKind kind, int64_t clock, int64_t
raw_icount)
+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 +49,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 v14 00/25] Fixing record/replay and adding reverse debugging, Pavel Dovgalyuk, 2019/03/15
- Re: [Qemu-devel] [PATCH v14 00/25] Fixing record/replay and adding reverse debugging, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 22/25] util/qemu-timer: refactor deadline calculation for external timers, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 23/25] replay: fix replay shutdown, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 25/25] icount: clean up cpu_can_io before jumping to the next block, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 13/25] replay: implement replay-seek command, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 14/25] replay: refine replay-time module,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v14 06/25] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 21/25] replay: document development rules, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 10/25] qapi: introduce replay.json for record/replay-related stuff, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 09/25] replay: provide an accessor for rr filename, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 18/25] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 15/25] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 04/25] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 11/25] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 19/25] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2019/03/15
- [Qemu-devel] [PATCH v14 01/25] replay: add missing fix for internal function, Pavel Dovgalyuk, 2019/03/15