46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 41e6f70a01044bf814949da00e22a18d0ada809b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bruce Rogers <brogers@suse.com>
|
||
|
|
Date: Fri, 25 May 2018 09:08:20 -0600
|
||
|
|
Subject: [PATCH] Revert "replay: don't process async events when warping the
|
||
|
|
clock"
|
||
|
|
|
||
|
|
This reverts commit 89e46eb477113550485bc24264d249de9fd1260a.
|
||
|
|
|
||
|
|
[BR: BSC#1094406]
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
replay/replay-events.c | 1 -
|
||
|
|
replay/replay.c | 7 +------
|
||
|
|
2 files changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/replay/replay-events.c b/replay/replay-events.c
|
||
|
|
index 707de3867b..fc7d458b90 100644
|
||
|
|
--- a/replay/replay-events.c
|
||
|
|
+++ b/replay/replay-events.c
|
||
|
|
@@ -201,7 +201,6 @@ static void replay_save_event(Event *event, int checkpoint)
|
||
|
|
void replay_save_events(int checkpoint)
|
||
|
|
{
|
||
|
|
g_assert(replay_mutex_locked());
|
||
|
|
- g_assert(checkpoint != CHECKPOINT_CLOCK_WARP_START);
|
||
|
|
while (!QTAILQ_EMPTY(&events_list)) {
|
||
|
|
Event *event = QTAILQ_FIRST(&events_list);
|
||
|
|
replay_save_event(event, checkpoint);
|
||
|
|
diff --git a/replay/replay.c b/replay/replay.c
|
||
|
|
index 8228261401..eae8daf18a 100644
|
||
|
|
--- a/replay/replay.c
|
||
|
|
+++ b/replay/replay.c
|
||
|
|
@@ -211,12 +211,7 @@ bool replay_checkpoint(ReplayCheckpoint checkpoint)
|
||
|
|
} else if (replay_mode == REPLAY_MODE_RECORD) {
|
||
|
|
g_assert(replay_mutex_locked());
|
||
|
|
replay_put_event(EVENT_CHECKPOINT + checkpoint);
|
||
|
|
- /* This checkpoint belongs to several threads.
|
||
|
|
- Processing events from different threads is
|
||
|
|
- non-deterministic */
|
||
|
|
- if (checkpoint != CHECKPOINT_CLOCK_WARP_START) {
|
||
|
|
- replay_save_events(checkpoint);
|
||
|
|
- }
|
||
|
|
+ replay_save_events(checkpoint);
|
||
|
|
res = true;
|
||
|
|
}
|
||
|
|
out:
|