mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

replay: rewrite async event handling

Browse Source 
This patch decouples checkpoints and async events.
It was a tricky part of replay implementation. Now it becomes
much simpler and easier to maintain.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <165364837856.688121.8785039478408995979.stgit@pasha-ThinkPad-X280>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Pavel Dovgalyuk
2022-05-27 13:46:18 +03:00
committed by Paolo Bonzini
parent 75bbe5e5ec
commit 60618e2d77
8 changed files with 54 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
replay/replay-events.c
View File

@ -170,12 +170,11 @@ void replay_block_event(QEMUBH *bh, uint64_t id)
}
}
static void replay_save_event(Event *event, int checkpoint)
static void replay_save_event(Event *event)
{
if (replay_mode != REPLAY_MODE_PLAY) {
/* put the event into the file */
replay_put_event(EVENT_ASYNC);
replay_put_byte(checkpoint);
replay_put_byte(event->event_kind);
/* save event-specific data */
@ -206,34 +205,27 @@ static void replay_save_event(Event *event, int checkpoint)
}
/* Called with replay mutex locked */
void replay_save_events(int checkpoint)
void replay_save_events(void)
{
g_assert(replay_mutex_locked());
g_assert(checkpoint != CHECKPOINT_CLOCK_WARP_START);
g_assert(checkpoint != CHECKPOINT_CLOCK_VIRTUAL);
while (!QTAILQ_EMPTY(&events_list)) {
Event *event = QTAILQ_FIRST(&events_list);
replay_save_event(event, checkpoint);
replay_save_event(event);
replay_run_event(event);
QTAILQ_REMOVE(&events_list, event, events);
g_free(event);
}
}
static Event *replay_read_event(int checkpoint)
static Event *replay_read_event(void)
{
Event *event;
if (replay_state.read_event_kind == -1) {
replay_state.read_event_checkpoint = replay_get_byte();
replay_state.read_event_kind = replay_get_byte();
replay_state.read_event_id = -1;
replay_check_error();
}
if (checkpoint != replay_state.read_event_checkpoint) {
return NULL;
}
/* Events that has not to be in the queue */
switch (replay_state.read_event_kind) {
case REPLAY_ASYNC_EVENT_BH:
@ -294,11 +286,11 @@ static Event *replay_read_event(int checkpoint)
}
/* Called with replay mutex locked */
void replay_read_events(int checkpoint)
void replay_read_events(void)
{
g_assert(replay_mutex_locked());
while (replay_state.data_kind == EVENT_ASYNC) {
Event *event = replay_read_event(checkpoint);
Event *event = replay_read_event();
if (!event) {
break;
}