qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org,
	igor.rubinov@gmail.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, hines@cert.org, fred.konrad@greensocs.com
Subject: [Qemu-devel] [PATCH v17 18/21] replay: initialization and deinitialization
Date: Mon, 07 Sep 2015 11:41:50 +0300	[thread overview]
Message-ID: <20150907084150.1664.31360.stgit@PASHA-ISP> (raw)
In-Reply-To: <20150907084005.1664.19540.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                   |    2 +
 replay/replay-internal.h |    2 +
 replay/replay.c          |  129 ++++++++++++++++++++++++++++++++++++++++++++++
 replay/replay.h          |   10 ++++
 stubs/replay.c           |    5 ++
 vl.c                     |    4 +
 6 files changed, 152 insertions(+), 0 deletions(-)

diff --git a/exec.c b/exec.c
index 54cd70a..395bcc4 100644
--- a/exec.c
+++ b/exec.c
@@ -51,6 +51,7 @@
 #include "qemu/main-loop.h"
 #include "exec/cputlb.h"
 #include "translate-all.h"
+#include "replay/replay.h"
 
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
@@ -841,6 +842,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 89c1dc7..820134f 100755
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -33,6 +33,8 @@ enum ReplayEvents {
     /* some of greater 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 ca9996e..e22e595 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -16,8 +16,16 @@
 #include "qemu/main-loop.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)
@@ -194,3 +202,124 @@ 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();
+        if (version != REPLAY_VERSION) {
+            fprintf(stderr, "Replay: invalid input log file version\n");
+            exit(1);
+        }
+        /* go to the beginning */
+        fseek(replay_file, HEADER_SIZE, 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) {
+            /* write end event */
+            replay_put_event(EVENT_END);
+
+            /* write header */
+            fseek(replay_file, 0, SEEK_SET);
+            replay_put_dword(REPLAY_VERSION);
+        }
+
+        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 c7de964..736555d 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 {
@@ -42,6 +43,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 e737dad..5cf587b 100755
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -25,3 +25,8 @@ int runstate_is_running(void)
 {
     return 0;
 }
+
+bool replay_events_enabled(void)
+{
+    return false;
+}
diff --git a/vl.c b/vl.c
index c461a98..cfc8d26 100644
--- a/vl.c
+++ b/vl.c
@@ -4626,6 +4626,8 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
+    replay_start();
+
     /* This checkpoint is required by replay to separate prior clock
        reading from the other reads, because timer polling functions query
        clock values from the log. */
@@ -4667,6 +4669,8 @@ int main(int argc, char **argv, char **envp)
     }
 
     main_loop();
+    replay_disable_events();
+
     bdrv_close_all();
     pause_all_vcpus();
     res_free();

  parent reply	other threads:[~2015-09-07  8:48 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-07  8:40 [Qemu-devel] [PATCH v17 00/21] Deterministic replay core Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 01/21] i386: partial revert of interrupt poll fix Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 02/21] replay: global variables and function stubs Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 03/21] replay: internal functions for replay log Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 04/21] replay: introduce mutex to protect the " Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 05/21] replay: introduce icount event Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 06/21] cpu-exec: allow temporary disabling icount Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 07/21] cpu: replay instructions sequence Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 08/21] i386: interrupt poll processing Pavel Dovgalyuk
2015-09-07  8:40 ` [Qemu-devel] [PATCH v17 09/21] replay: interrupts and exceptions Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 10/21] replay: asynchronous events infrastructure Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 11/21] replay: recording and replaying clock ticks Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 12/21] replay: shutdown event Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 13/21] icount: improve counting for record/replay Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 14/21] replay: checkpoints Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 15/21] bottom halves: introduce bh call function Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 16/21] replay: ptimer Pavel Dovgalyuk
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 17/21] typedef: add typedef for QemuOpts Pavel Dovgalyuk
2015-09-07  8:41 ` Pavel Dovgalyuk [this message]
2015-09-07  8:41 ` [Qemu-devel] [PATCH v17 19/21] replay: replay blockers for devices Pavel Dovgalyuk
2015-09-07  8:42 ` [Qemu-devel] [PATCH v17 20/21] replay: command line options Pavel Dovgalyuk
2015-09-07  8:42 ` [Qemu-devel] [PATCH v17 21/21] replay: recording of the user input Pavel Dovgalyuk
2015-09-11  5:52 ` [Qemu-devel] [PATCH v17 00/21] Deterministic replay core Pavel Dovgaluk
     [not found] ` <45193.409038666$1441951862@news.gmane.org>
2015-09-11  6:31   ` 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=20150907084150.1664.31360.stgit@PASHA-ISP \
    --to=pavel.dovgaluk@ispras.ru \
    --cc=alex.bennee@linaro.org \
    --cc=batuzovk@ispras.ru \
    --cc=edgar.iglesias@xilinx.com \
    --cc=fred.konrad@greensocs.com \
    --cc=hines@cert.org \
    --cc=igor.rubinov@gmail.com \
    --cc=maria.klimushenkova@ispras.ru \
    --cc=mark.burton@greensocs.com \
    --cc=pbonzini@redhat.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).