From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com,
alex.bennee@linaro.org, mark.burton@greensocs.com,
real@ispras.ru, batuzovk@ispras.ru,
maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru,
pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com
Subject: [Qemu-devel] [RFC PATCH v7 19/21] replay: initialization and deinitialization
Date: Mon, 12 Jan 2015 15:01:34 +0300 [thread overview]
Message-ID: <20150112120134.3504.38091.stgit@PASHA-ISP> (raw)
In-Reply-To: <20150112115944.3504.66763.stgit@PASHA-ISP>
This patch introduces the functions for enabling the record/replay and for
freeing the resources when simulator closes.
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
---
block.c | 2 -
exec.c | 1
replay/replay-internal.h | 2 +
replay/replay.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++
replay/replay.h | 13 ++++
stubs/replay.c | 1
vl.c | 5 ++
7 files changed, 157 insertions(+), 1 deletions(-)
diff --git a/block.c b/block.c
index e4cad41..1dd9837 100644
--- a/block.c
+++ b/block.c
@@ -1982,7 +1982,7 @@ void bdrv_drain_all(void)
aio_context_release(aio_context);
}
}
- if (replay_mode == REPLAY_MODE_PLAY) {
+ if (replay_mode == REPLAY_MODE_PLAY && replay_checkpoints) {
/* Skip checkpoints from the log */
while (replay_checkpoint(8)) {
/* Nothing */
diff --git a/exec.c b/exec.c
index 081818e..473aec7 100644
--- a/exec.c
+++ b/exec.c
@@ -799,6 +799,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...)
}
va_end(ap2);
va_end(ap);
+ replay_finish();
#if defined(CONFIG_USER_ONLY)
{
struct sigaction act;
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index c32bd9c..142e09a 100755
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -34,6 +34,8 @@
/* for checkpoint event */
#define EVENT_CHECKPOINT 96
+/* end of log event */
+#define EVENT_END 127
/* Asynchronous events IDs */
diff --git a/replay/replay.c b/replay/replay.c
index 27176c3..e98417e 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -14,14 +14,23 @@
#include "replay-internal.h"
#include "qemu/timer.h"
+/* Current version of the replay mechanism.
+ Increase it when file format changes. */
+#define REPLAY_VERSION 0xe02002
+/* Size of replay log header */
+#define HEADER_SIZE (sizeof(uint32_t) + sizeof(uint64_t))
+
ReplayMode replay_mode = REPLAY_MODE_NONE;
/*! Stores current submode for PLAY mode */
ReplaySubmode play_submode = REPLAY_SUBMODE_UNKNOWN;
+/* Name of replay file */
+static char *replay_filename;
/* Suffix for the disk images filenames */
char *replay_image_suffix;
ReplayState replay_state;
+bool replay_checkpoints;
ReplaySubmode replay_get_play_submode(void)
{
@@ -162,6 +171,10 @@ void replay_shutdown_request(void)
/* Used checkpoints: 2 3 4 5 6 7 8 9 10 11 */
int replay_checkpoint(unsigned int checkpoint)
{
+ if (!replay_checkpoints) {
+ return 1;
+ }
+
replay_save_instructions();
if (replay_file) {
@@ -186,3 +199,124 @@ int replay_checkpoint(unsigned int checkpoint)
return 1;
}
+
+static void replay_enable(const char *fname, int mode)
+{
+ const char *fmode = NULL;
+ if (replay_file) {
+ fprintf(stderr,
+ "Replay: some record/replay operation is already started\n");
+ return;
+ }
+
+ switch (mode) {
+ case REPLAY_MODE_RECORD:
+ fmode = "wb";
+ break;
+ case REPLAY_MODE_PLAY:
+ fmode = "rb";
+ play_submode = REPLAY_SUBMODE_NORMAL;
+ break;
+ default:
+ fprintf(stderr, "Replay: internal error: invalid replay mode\n");
+ exit(1);
+ }
+
+ atexit(replay_finish);
+
+ replay_file = fopen(fname, fmode);
+ if (replay_file == NULL) {
+ fprintf(stderr, "Replay: open %s: %s\n", fname, strerror(errno));
+ exit(1);
+ }
+
+ replay_filename = g_strdup(fname);
+
+ replay_mode = mode;
+ replay_has_unread_data = 0;
+ replay_data_kind = -1;
+ replay_state.instructions_count = 0;
+ replay_state.current_step = 0;
+
+ /* skip file header for RECORD and check it for PLAY */
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ fseek(replay_file, HEADER_SIZE, SEEK_SET);
+ } else if (replay_mode == REPLAY_MODE_PLAY) {
+ unsigned int version = replay_get_dword();
+ uint64_t offset = replay_get_qword();
+ if (version != REPLAY_VERSION) {
+ fprintf(stderr, "Replay: invalid input log file version\n");
+ exit(1);
+ }
+ /* go to the beginning */
+ fseek(replay_file, 12, SEEK_SET);
+ }
+
+ replay_init_events();
+}
+
+void replay_configure(QemuOpts *opts, int mode)
+{
+ const char *fname;
+
+ fname = qemu_opt_get(opts, "fname");
+ if (!fname) {
+ fprintf(stderr, "File name not specified for replay\n");
+ exit(1);
+ }
+
+ const char *suffix = qemu_opt_get(opts, "suffix");
+ if (suffix) {
+ replay_image_suffix = g_strdup(suffix);
+ } else {
+ replay_image_suffix = g_strdup("replay_qcow");
+ }
+
+ replay_enable(fname, mode);
+}
+
+void replay_init_timer(void)
+{
+ if (replay_mode == REPLAY_MODE_NONE) {
+ return;
+ }
+
+ replay_checkpoints = true;
+ replay_enable_events();
+}
+
+void replay_finish(void)
+{
+ if (replay_mode == REPLAY_MODE_NONE) {
+ return;
+ }
+
+ replay_save_instructions();
+
+ /* finalize the file */
+ if (replay_file) {
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ uint64_t offset = 0;
+ /* write end event */
+ replay_put_event(EVENT_END);
+
+ /* write header */
+ fseek(replay_file, 0, SEEK_SET);
+ replay_put_dword(REPLAY_VERSION);
+ replay_put_qword(offset);
+ }
+
+ fclose(replay_file);
+ replay_file = NULL;
+ }
+ if (replay_filename) {
+ g_free(replay_filename);
+ replay_filename = NULL;
+ }
+ if (replay_image_suffix) {
+ g_free(replay_image_suffix);
+ replay_image_suffix = NULL;
+ }
+
+ replay_finish_events();
+}
diff --git a/replay/replay.h b/replay/replay.h
index c72a3fd..9c40648 100755
--- a/replay/replay.h
+++ b/replay/replay.h
@@ -17,6 +17,8 @@
#include <time.h>
#include "qapi-types.h"
+struct QemuOpts;
+
/* replay clock kinds */
/* rdtsc */
#define REPLAY_CLOCK_REAL_TICKS 0
@@ -29,10 +31,21 @@
extern ReplayMode replay_mode;
extern char *replay_image_suffix;
+/*! Is set to true after finishing initialization */
+extern bool replay_checkpoints;
/*! Returns replay play submode */
ReplaySubmode replay_get_play_submode(void);
+/* Replay process control functions */
+
+/*! Enables recording or saving event log with specified parameters */
+void replay_configure(struct QemuOpts *opts, int mode);
+/*! Initializes timers used for snapshotting and enables events recording */
+void replay_init_timer(void);
+/*! Closes replay log file and frees other resources. */
+void replay_finish(void);
+
/* Processing the instructions */
/*! Returns number of executed instructions. */
diff --git a/stubs/replay.c b/stubs/replay.c
index 770d59a..52076d9 100755
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -2,6 +2,7 @@
#include "sysemu/sysemu.h"
ReplayMode replay_mode;
+bool replay_checkpoints;
ReplaySubmode replay_get_play_submode(void)
{
diff --git a/vl.c b/vl.c
index 663e4db..8b1b793 100644
--- a/vl.c
+++ b/vl.c
@@ -4372,7 +4372,12 @@ int main(int argc, char **argv, char **envp)
}
}
+ replay_init_timer();
+
main_loop();
+ if (replay_mode != REPLAY_MODE_NONE) {
+ replay_disable_events();
+ }
bdrv_close_all();
pause_all_vcpus();
res_free();
next prev parent reply other threads:[~2015-01-12 12:01 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 11:59 [Qemu-devel] [RFC PATCH v7 00/21] Deterministic replay core Pavel Dovgalyuk
2015-01-12 11:59 ` [Qemu-devel] [RFC PATCH v7 01/21] i386: partial revert of interrupt poll fix Pavel Dovgalyuk
2015-01-12 11:59 ` [Qemu-devel] [RFC PATCH v7 02/21] replay: global variables and function stubs Pavel Dovgalyuk
2015-01-12 12:19 ` Paolo Bonzini
2015-01-12 12:21 ` Pavel Dovgaluk
2015-01-12 12:25 ` Paolo Bonzini
2015-01-20 17:07 ` Eric Blake
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 03/21] sysemu: system functions for replay Pavel Dovgalyuk
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 04/21] replay: internal functions for replay log Pavel Dovgalyuk
2015-01-12 12:49 ` Paolo Bonzini
2015-01-12 12:52 ` Pavel Dovgaluk
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 05/21] replay: introduce icount event Pavel Dovgalyuk
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 06/21] cpu-exec: allow temporary disabling icount Pavel Dovgalyuk
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 07/21] cpu: replay instructions sequence Pavel Dovgalyuk
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions Pavel Dovgalyuk
2015-01-12 12:34 ` Paolo Bonzini
2015-01-12 12:40 ` Pavel Dovgaluk
2015-01-12 12:54 ` Paolo Bonzini
2015-01-14 9:07 ` Pavel Dovgaluk
[not found] ` <3141.42739302969$1421226482@news.gmane.org>
2015-01-14 9:49 ` Paolo Bonzini
2015-01-14 10:06 ` Pavel Dovgaluk
[not found] ` <48665.1020743468$1421230035@news.gmane.org>
2015-01-14 10:21 ` Paolo Bonzini
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 09/21] replay: asynchronous events infrastructure Pavel Dovgalyuk
2015-01-12 12:20 ` Paolo Bonzini
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 10/21] cpus: make icount warp deterministic in replay mode Pavel Dovgalyuk
2015-01-12 12:01 ` Paolo Bonzini
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 11/21] timer: fix usage of clock functions Pavel Dovgalyuk
2015-01-12 12:03 ` Paolo Bonzini
2015-01-12 12:00 ` [Qemu-devel] [RFC PATCH v7 12/21] replay: recording and replaying clock ticks Pavel Dovgalyuk
2015-01-12 12:14 ` Paolo Bonzini
2015-01-12 12:43 ` Pavel Dovgaluk
2015-01-12 12:45 ` Paolo Bonzini
2015-01-13 9:21 ` Pavel Dovgaluk
2015-01-13 9:38 ` Paolo Bonzini
2015-01-16 8:03 ` Pavel Dovgaluk
2015-01-19 11:51 ` Paolo Bonzini
2015-01-19 12:03 ` Pavel Dovgaluk
2015-01-19 12:15 ` Paolo Bonzini
2015-01-19 12:43 ` Pavel Dovgaluk
2015-01-19 12:57 ` Paolo Bonzini
2015-01-19 13:01 ` Pavel Dovgaluk
2015-01-19 13:02 ` Paolo Bonzini
2015-01-19 13:10 ` Pavel Dovgaluk
2015-01-19 13:12 ` Paolo Bonzini
2015-01-20 6:24 ` Pavel Dovgaluk
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 13/21] replay: recording and replaying different timers Pavel Dovgalyuk
2015-01-12 12:08 ` Paolo Bonzini
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 14/21] replay: shutdown event Pavel Dovgalyuk
2015-01-12 12:05 ` Paolo Bonzini
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 15/21] replay: checkpoints Pavel Dovgalyuk
2015-01-12 12:13 ` Paolo Bonzini
2015-01-13 9:07 ` Pavel Dovgaluk
2015-01-13 9:15 ` Pavel Dovgaluk
2015-01-13 9:40 ` Paolo Bonzini
2015-01-13 14:26 ` Pavel Dovgaluk
[not found] ` <37329.9191626304$1421159249@news.gmane.org>
2015-01-13 14:52 ` Paolo Bonzini
2015-01-13 14:53 ` Paolo Bonzini
2015-01-22 8:50 ` Pavel Dovgaluk
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 16/21] replay: bottom halves Pavel Dovgalyuk
2015-01-12 12:16 ` Paolo Bonzini
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 17/21] replay: replay aio requests Pavel Dovgalyuk
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 18/21] replay: thread pool Pavel Dovgalyuk
2015-01-12 12:01 ` Pavel Dovgalyuk [this message]
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 20/21] replay: command line options Pavel Dovgalyuk
2015-01-12 12:21 ` Paolo Bonzini
2015-01-12 12:23 ` Pavel Dovgaluk
2015-01-12 12:26 ` Paolo Bonzini
2015-01-12 12:01 ` [Qemu-devel] [RFC PATCH v7 21/21] replay: recording of the user input Pavel Dovgalyuk
2015-01-12 12:25 ` Paolo Bonzini
2015-01-16 7:23 ` Pavel Dovgaluk
[not found] ` <43535.7048445896$1421393030@news.gmane.org>
2015-01-19 11:53 ` Paolo Bonzini
2015-01-12 12:39 ` [Qemu-devel] [RFC PATCH v7 00/21] Deterministic replay core Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150112120134.3504.38091.stgit@PASHA-ISP \
--to=pavel.dovgaluk@ispras.ru \
--cc=afaerber@suse.de \
--cc=alex.bennee@linaro.org \
--cc=batuzovk@ispras.ru \
--cc=fred.konrad@greensocs.com \
--cc=maria.klimushenkova@ispras.ru \
--cc=mark.burton@greensocs.com \
--cc=pbonzini@redhat.com \
--cc=peter.crosthwaite@xilinx.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=real@ispras.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).