[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-4.2 12/14] replay: refine replay-time module
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH for-4.2 12/14] replay: refine replay-time module |
Date: |
Wed, 24 Jul 2019 11:44:21 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Pavel Dovgalyuk <address@hidden>
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 5154cb0ce9..49c9e5d8b2 100644
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@@ -14,18 +14,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;
}
@@ -47,20 +48,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 for-4.2 04/14] replay: update docs for record/replay with block devices, (continued)
- [Qemu-devel] [PATCH for-4.2 04/14] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 05/14] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 06/14] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 07/14] replay: provide an accessor for rr filename, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 08/14] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 09/14] replay: document development rules, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 10/14] util/qemu-timer: refactor deadline calculation for external timers, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 11/14] replay: fix replay shutdown, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 12/14] replay: refine replay-time module,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH for-4.2 13/14] replay: rename step-related variables and functions, Pavel Dovgalyuk, 2019/07/24
- [Qemu-devel] [PATCH for-4.2 14/14] icount: clean up cpu_can_io before jumping to the next block, Pavel Dovgalyuk, 2019/07/24
- Re: [Qemu-devel] [PATCH for-4.2 00/14] Some record/replay fixes, Paolo Bonzini, 2019/07/24