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 v10 21/24] replay: initialization and deinitialization
Date: Fri, 27 Feb 2015 16:11:49 +0300 [thread overview]
Message-ID: <20150227131148.11912.58984.stgit@PASHA-ISP> (raw)
In-Reply-To: <20150227130939.11912.50660.stgit@PASHA-ISP>
This patch introduces the functions for enabling the record/replay and for
freeing the resources when simulator closes.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
---
exec.c | 1
replay/replay-internal.h | 2 +
replay/replay.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++
replay/replay.h | 10 +++
stubs/replay.c | 5 ++
vl.c | 4 +
6 files changed, 160 insertions(+), 0 deletions(-)
diff --git a/exec.c b/exec.c
index 6dff7bc..1d9094d 100644
--- a/exec.c
+++ b/exec.c
@@ -783,6 +783,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 2f557a6..776a30c 100755
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -33,6 +33,8 @@ enum ReplayEvents {
/* some of grteater codes are reserved for checkpoints */
EVENT_CHECKPOINT,
EVENT_CHECKPOINT_LAST = EVENT_CHECKPOINT + CHECKPOINT_COUNT - 1,
+ /* end of log event */
+ EVENT_END,
EVENT_COUNT
};
diff --git a/replay/replay.c b/replay/replay.c
index 8081681..98b5e2f 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -15,8 +15,16 @@
#include "qemu/timer.h"
#include "sysemu/sysemu.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;
+/* Name of replay file */
+static char *replay_filename;
ReplayState replay_state;
bool replay_next_event_is(int event)
@@ -157,6 +165,10 @@ void replay_shutdown_request(void)
bool replay_checkpoint(ReplayCheckpoint checkpoint)
{
bool res = false;
+ if (!replay_events_enabled()) {
+ return true;
+ }
+
replay_save_instructions();
if (!replay_file) {
@@ -186,3 +198,129 @@ out:
replay_mutex_unlock();
return res;
}
+
+static void replay_enable(const char *fname, int mode)
+{
+ const char *fmode = NULL;
+ assert(!replay_file);
+
+ switch (mode) {
+ case REPLAY_MODE_RECORD:
+ fmode = "wb";
+ break;
+ case REPLAY_MODE_PLAY:
+ fmode = "rb";
+ break;
+ default:
+ fprintf(stderr, "Replay: internal error: invalid replay mode\n");
+ exit(1);
+ }
+
+ atexit(replay_finish);
+
+ replay_mutex_init();
+
+ 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_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_fetch_data_kind();
+ }
+
+ replay_init_events();
+}
+
+void replay_configure(QemuOpts *opts)
+{
+ const char *fname;
+ const char *rr;
+ ReplayMode mode = REPLAY_MODE_NONE;
+
+ rr = qemu_opt_get(opts, "rr");
+ if (!rr) {
+ /* Just enabling icount */
+ return;
+ } else if (!strcmp(rr, "record")) {
+ mode = REPLAY_MODE_RECORD;
+ } else if (!strcmp(rr, "replay")) {
+ mode = REPLAY_MODE_PLAY;
+ } else {
+ error_report("Invalid icount rr option: %s", rr);
+ exit(1);
+ }
+
+ fname = qemu_opt_get(opts, "rrfile");
+ if (!fname) {
+ error_report("File name not specified for replay");
+ exit(1);
+ }
+
+ replay_enable(fname, mode);
+}
+
+void replay_start(void)
+{
+ if (replay_mode == REPLAY_MODE_NONE) {
+ return;
+ }
+
+ /* Timer for snapshotting will be set up here. */
+
+ 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);
+ /* Just zero in this version.
+ But will be used later for snapshots table. */
+ replay_put_qword(offset);
+ }
+
+ fclose(replay_file);
+ replay_file = NULL;
+ }
+ if (replay_filename) {
+ g_free(replay_filename);
+ replay_filename = NULL;
+ }
+
+ replay_finish_events();
+ replay_mutex_destroy();
+}
diff --git a/replay/replay.h b/replay/replay.h
index 467132d..e0b08c6 100755
--- a/replay/replay.h
+++ b/replay/replay.h
@@ -15,6 +15,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "qapi-types.h"
+#include "qemu/typedefs.h"
/* replay clock kinds */
enum ReplayClockKind {
@@ -39,6 +40,15 @@ typedef enum ReplayCheckpoint ReplayCheckpoint;
extern ReplayMode replay_mode;
+/* Replay process control functions */
+
+/*! Enables recording or saving event log with specified parameters */
+void replay_configure(struct QemuOpts *opts);
+/*! Initializes timers used for snapshotting and enables events recording */
+void replay_start(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 81eddae..19fabe9 100755
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -34,3 +34,8 @@ uint64_t replay_get_current_step(void)
void replay_add_thread_event(void *opaque, void *opaque2, uint64_t id)
{
}
+
+bool replay_events_enabled(void)
+{
+ return false;
+}
diff --git a/vl.c b/vl.c
index 565bbb2..bad9bee 100644
--- a/vl.c
+++ b/vl.c
@@ -4323,6 +4323,8 @@ int main(int argc, char **argv, char **envp)
/* Done notifiers can load ROMs */
rom_load_done();
+ replay_start();
+
qemu_system_reset(VMRESET_SILENT);
if (loadvm) {
if (load_vmstate(loadvm) < 0) {
@@ -4359,6 +4361,8 @@ int main(int argc, char **argv, char **envp)
}
main_loop();
+ replay_disable_events();
+
bdrv_close_all();
pause_all_vcpus();
res_free();
next prev parent reply other threads:[~2015-02-27 13:11 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 13:09 [Qemu-devel] [RFC PATCH v10 00/24] Deterministic replay core Pavel Dovgalyuk
2015-02-27 13:09 ` [Qemu-devel] [RFC PATCH v10 01/24] i386: partial revert of interrupt poll fix Pavel Dovgalyuk
2015-02-27 13:09 ` [Qemu-devel] [RFC PATCH v10 02/24] replay: global variables and function stubs Pavel Dovgalyuk
2015-03-13 19:07 ` Eric Blake
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 03/24] sysemu: system functions for replay Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 04/24] replay: internal functions for replay log Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 05/24] replay: introduce mutex to protect the " Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 06/24] replay: introduce icount event Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 07/24] cpu-exec: allow temporary disabling icount Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 08/24] cpu: replay instructions sequence Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 09/24] i386: interrupt poll processing Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 10/24] replay: interrupts and exceptions Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 11/24] replay: asynchronous events infrastructure Pavel Dovgalyuk
2015-02-27 13:10 ` [Qemu-devel] [RFC PATCH v10 12/24] replay: recording and replaying clock ticks Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 13/24] timer: replace time() with QEMU_CLOCK_HOST Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 14/24] replay: shutdown event Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 15/24] replay: checkpoints Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 16/24] aio: replace stack of bottom halves with queue Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 17/24] replay: bottom halves Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 18/24] replay: replay aio requests Pavel Dovgalyuk
2015-03-13 17:01 ` Paolo Bonzini
2015-03-16 10:40 ` Pavel Dovgaluk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 19/24] replay: thread pool Pavel Dovgalyuk
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 20/24] typedef: add typedef for QemuOpts Pavel Dovgalyuk
2015-02-27 13:11 ` Pavel Dovgalyuk [this message]
2015-02-27 13:11 ` [Qemu-devel] [RFC PATCH v10 22/24] replay: replay blockers for devices Pavel Dovgalyuk
2015-02-27 13:12 ` [Qemu-devel] [RFC PATCH v10 23/24] replay: command line options Pavel Dovgalyuk
2015-02-27 13:12 ` [Qemu-devel] [RFC PATCH v10 24/24] replay: recording of the user input Pavel Dovgalyuk
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=20150227131148.11912.58984.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.