ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replay: refine replay-time module 

This patch removes refactoring artifacts from the replay/replay-time.c

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Message-Id: <156404427799.18669.8072341590511911277.stgit@pasha-Precision-3630-Tower>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Pavel Dovgalyuk 2019-07-25 11:44:38 +03:00 committed by Paolo Bonzini
parent e957ad8aef
commit 82f4915653
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
replay/replay-time.c
View File

@ -14,18 +14,19 @@
#include "replay-internal.h" #include "replay-internal.h"
#include "qemu/error-report.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_file);
g_assert(replay_mutex_locked()); g_assert(replay_mutex_locked());
/* Due to the caller's locking requirements we get the icount from it /*
* instead of using replay_save_instructions(). * 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_advance_current_step(raw_icount);
replay_put_qword(clock); replay_put_event(EVENT_CLOCK + kind);
} replay_put_qword(clock);
return clock; return clock;
} }
@ -47,20 +48,15 @@ void replay_read_next_clock(ReplayClockKind kind)
/*! Reads next clock event from the input. */ /*! Reads next clock event from the input. */
int64_t replay_read_clock(ReplayClockKind kind) int64_t replay_read_clock(ReplayClockKind kind)
{ {
int64_t ret;
g_assert(replay_file && replay_mutex_locked()); g_assert(replay_file && replay_mutex_locked());
replay_account_executed_instructions(); replay_account_executed_instructions();
if (replay_file) { if (replay_next_event_is(EVENT_CLOCK + kind)) {
int64_t ret; replay_read_next_clock(kind);
if (replay_next_event_is(EVENT_CLOCK + kind)) {
replay_read_next_clock(kind);
}
ret = replay_state.cached_clock[kind];
return ret;
} }
ret = replay_state.cached_clock[kind];
error_report("REPLAY INTERNAL ERROR %d", __LINE__); return ret;
exit(1);
} }