[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v6 12/20] replay: make locking visible outside r
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v6 12/20] replay: make locking visible outside replay code |
Date: |
Wed, 07 Feb 2018 15:05:00 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Alex Bennée <address@hidden>
The replay_mutex_lock/unlock/locked functions are now going to be used
for ensuring lock-step behaviour between the two threads. Make them
public API functions and also provide stubs for non-QEMU builds on
common paths.
Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Pavel Dovgalyuk <address@hidden>
---
include/sysemu/replay.h | 14 ++++++++++++++
replay/replay-internal.c | 2 +-
replay/replay-internal.h | 5 ++---
stubs/replay.c | 15 +++++++++++++++
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index b86d6bb..9973849 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -47,6 +47,20 @@ extern ReplayMode replay_mode;
/* Name of the initial VM snapshot */
extern char *replay_snapshot;
+/* Replay locking
+ *
+ * The locks are needed to protect the shared structures and log file
+ * when doing record/replay. They also are the main sync-point between
+ * the main-loop thread and the vCPU thread. This was a role
+ * previously filled by the BQL which has been busy trying to reduce
+ * its impact across the code. This ensures blocks of events stay
+ * sequential and reproducible.
+ */
+
+void replay_mutex_lock(void);
+void replay_mutex_unlock(void);
+bool replay_mutex_locked(void);
+
/* Replay process control functions */
/*! Enables recording or saving event log with specified parameters */
diff --git a/replay/replay-internal.c b/replay/replay-internal.c
index 0d7e1d6..7cdefea 100644
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@@ -181,7 +181,7 @@ void replay_mutex_destroy(void)
qemu_mutex_destroy(&lock);
}
-static bool replay_mutex_locked(void)
+bool replay_mutex_locked(void)
{
return replay_locked;
}
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index 8e4c701..f5f8e96 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -100,12 +100,11 @@ int64_t replay_get_qword(void);
void replay_get_array(uint8_t *buf, size_t *size);
void replay_get_array_alloc(uint8_t **buf, size_t *size);
-/* Mutex functions for protecting replay log file */
+/* Mutex functions for protecting replay log file and ensuring
+ * synchronisation between vCPU and main-loop threads. */
void replay_mutex_init(void);
void replay_mutex_destroy(void);
-void replay_mutex_lock(void);
-void replay_mutex_unlock(void);
/*! Checks error status of the file. */
void replay_check_error(void);
diff --git a/stubs/replay.c b/stubs/replay.c
index 9991ee5..cb050ef 100644
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -73,3 +73,18 @@ uint64_t blkreplay_next_id(void)
{
return 0;
}
+
+void replay_mutex_lock(void)
+{
+ abort();
+}
+
+void replay_mutex_unlock(void)
+{
+ abort();
+}
+
+bool replay_mutex_locked(void)
+{
+ return false;
+}
- [Qemu-devel] [RFC PATCH v6 02/20] block: implement bdrv_snapshot_goto for blkreplay, (continued)
- [Qemu-devel] [RFC PATCH v6 02/20] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 03/20] blkreplay: create temporary overlay for underlaying devices, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 04/20] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 05/20] replay: fix processing async events, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 06/20] replay: fixed replay_enable_events, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 07/20] replay: fix save/load vm for non-empty queue, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 08/20] replay: added replay log format description, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 09/20] replay: save prior value of the host clock, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 10/20] replay/replay.c: bump REPLAY_VERSION again, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 11/20] replay/replay-internal.c: track holding of replay_lock, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 12/20] replay: make locking visible outside replay code,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v6 13/20] replay: push replay_mutex_lock up the call tree, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 14/20] replay: don't destroy mutex at exit, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 15/20] replay: check return values of fwrite, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 16/20] replay: avoid recursive call of checkpoints, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 18/20] replay: don't process async events when warping the clock, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 19/20] replay: save vmstate of the asynchronous events, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 17/20] scripts/replay-dump.py: replay log dumper, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 20/20] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2018/02/07
- Re: [Qemu-devel] [RFC PATCH v6 00/20] replay additions, Ciro Santilli, 2018/02/07