d759c951f3
Now instead of using the replay_lock to guard the output of the log we now use it to protect the whole execution section. This replaces what the BQL used to do when it was held during TCG execution. We also introduce some rules for locking order - mainly that you cannot take the replay_mutex while holding the BQL. This leads to some slight sophistry during start-up and extending the replay_mutex_destroy function to unlock the mutex without checking for the BQL condition so it can be cleanly dropped in the non-replay case. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> Tested-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> Message-Id: <20180227095248.1060.40374.stgit@pasha-VirtualBox> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
66 lines
1.5 KiB
C
66 lines
1.5 KiB
C
/*
|
|
* replay-time.c
|
|
*
|
|
* Copyright (c) 2010-2015 Institute for System Programming
|
|
* of the Russian Academy of Sciences.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu-common.h"
|
|
#include "sysemu/replay.h"
|
|
#include "replay-internal.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
int64_t replay_save_clock(ReplayClockKind kind, int64_t clock)
|
|
{
|
|
|
|
if (replay_file) {
|
|
g_assert(replay_mutex_locked());
|
|
|
|
replay_save_instructions();
|
|
replay_put_event(EVENT_CLOCK + kind);
|
|
replay_put_qword(clock);
|
|
}
|
|
|
|
return clock;
|
|
}
|
|
|
|
void replay_read_next_clock(ReplayClockKind kind)
|
|
{
|
|
unsigned int read_kind = replay_state.data_kind - EVENT_CLOCK;
|
|
|
|
assert(read_kind == kind);
|
|
|
|
int64_t clock = replay_get_qword();
|
|
|
|
replay_check_error();
|
|
replay_finish_event();
|
|
|
|
replay_state.cached_clock[read_kind] = clock;
|
|
}
|
|
|
|
/*! Reads next clock event from the input. */
|
|
int64_t replay_read_clock(ReplayClockKind kind)
|
|
{
|
|
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;
|
|
}
|
|
|
|
error_report("REPLAY INTERNAL ERROR %d", __LINE__);
|
|
exit(1);
|
|
}
|