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 13/21] replay: recording and replaying different timers
Date: Mon, 12 Jan 2015 15:01:00 +0300 [thread overview]
Message-ID: <20150112120100.3504.6785.stgit@PASHA-ISP> (raw)
In-Reply-To: <20150112115944.3504.66763.stgit@PASHA-ISP>
This patch introduces functions for recording and replaying realtime sources,
that do not use qemu-clock interface. These include return value of time()
function in time_t and struct tm forms. Patch also adds warning to
get_timedate function to prevent its usage in recording mode, because it may
lead to non-determinism.
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
---
hw/timer/mc146818rtc.c | 10 ++++
hw/timer/pl031.c | 10 ++++
include/qemu-common.h | 1
replay/replay-internal.h | 4 ++
replay/replay-time.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++
replay/replay.h | 8 +++
vl.c | 17 ++++++-
7 files changed, 157 insertions(+), 5 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index f18d128..7e27931 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -28,6 +28,7 @@
#include "qapi/visitor.h"
#include "qapi-event.h"
#include "qmp-commands.h"
+#include "replay/replay.h"
#ifdef TARGET_I386
#include "hw/i386/apic.h"
@@ -703,7 +704,14 @@ static void rtc_set_date_from_host(ISADevice *dev)
RTCState *s = MC146818_RTC(dev);
struct tm tm;
- qemu_get_timedate(&tm, 0);
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ qemu_get_timedate_no_warning(&tm, 0);
+ replay_save_tm(&tm);
+ } else if (replay_mode == REPLAY_MODE_PLAY) {
+ replay_read_tm(&tm);
+ } else {
+ qemu_get_timedate_no_warning(&tm, 0);
+ }
s->base_rtc = mktimegm(&tm);
s->last_update = qemu_clock_get_ns(rtc_clock);
diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
index 34d9b44..19264f2 100644
--- a/hw/timer/pl031.c
+++ b/hw/timer/pl031.c
@@ -14,6 +14,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
+#include "replay/replay.h"
//#define DEBUG_PL031
@@ -200,7 +201,14 @@ static int pl031_init(SysBusDevice *dev)
sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
- qemu_get_timedate(&tm, 0);
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ qemu_get_timedate_no_warning(&tm, 0);
+ replay_save_tm(&tm);
+ } else if (replay_mode == REPLAY_MODE_PLAY) {
+ replay_read_tm(&tm);
+ } else {
+ qemu_get_timedate_no_warning(&tm, 0);
+ }
s->tick_offset = mktimegm(&tm) -
qemu_clock_get_ns(rtc_clock) / get_ticks_per_sec();
diff --git a/include/qemu-common.h b/include/qemu-common.h
index f862214..e30adc5 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -129,6 +129,7 @@ void dump_drift_info(FILE *f, fprintf_function cpu_fprintf);
int qemu_main(int argc, char **argv, char **envp);
#endif
+void qemu_get_timedate_no_warning(struct tm *tm, int offset);
void qemu_get_timedate(struct tm *tm, int offset);
int qemu_timedate_diff(struct tm *tm);
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index c36d7de..009029d 100755
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -14,6 +14,10 @@
#include <stdio.h>
+/* for time_t event */
+#define EVENT_TIME_T 1
+/* for tm event */
+#define EVENT_TM 2
/* for software interrupt */
#define EVENT_INTERRUPT 15
/* for emulated exceptions */
diff --git a/replay/replay-time.c b/replay/replay-time.c
index 3f94f4e..5d944d3 100755
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@@ -77,3 +77,115 @@ int64_t replay_read_clock(unsigned int kind)
fprintf(stderr, "REPLAY INTERNAL ERROR %d\n", __LINE__);
exit(1);
}
+
+/*! Saves time_t value to the log */
+static void replay_save_time_t(time_t tm)
+{
+ replay_save_instructions();
+
+ if (replay_file) {
+ replay_put_event(EVENT_TIME_T);
+ if (sizeof(tm) == 4) {
+ replay_put_dword(tm);
+ } else if (sizeof(tm) == 8) {
+ replay_put_qword(tm);
+ } else {
+ fprintf(stderr, "invalid time_t sizeof: %u\n",
+ (unsigned)sizeof(tm));
+ exit(1);
+ }
+ }
+}
+
+/*! Reads time_t value from the log. Stops execution in case of error */
+static time_t replay_read_time_t(void)
+{
+ replay_exec_instructions();
+
+ if (replay_file) {
+ time_t tm;
+
+ skip_async_events_until(EVENT_TIME_T);
+
+ if (sizeof(tm) == 4) {
+ tm = replay_get_dword();
+ } else if (sizeof(tm) == 8) {
+ tm = replay_get_qword();
+ } else {
+ fprintf(stderr, "invalid time_t sizeof: %u\n",
+ (unsigned)sizeof(tm));
+ exit(1);
+ }
+
+ replay_check_error();
+
+ replay_has_unread_data = 0;
+
+ return tm;
+ }
+
+ fprintf(stderr, "REPLAY INTERNAL ERROR %d\n", __LINE__);
+ exit(1);
+}
+
+void replay_save_tm(struct tm *tm)
+{
+ replay_save_instructions();
+
+ if (replay_file) {
+ replay_put_event(EVENT_TM);
+
+ replay_put_dword(tm->tm_sec);
+ replay_put_dword(tm->tm_min);
+ replay_put_dword(tm->tm_hour);
+ replay_put_dword(tm->tm_mday);
+ replay_put_dword(tm->tm_mon);
+ replay_put_dword(tm->tm_year);
+ replay_put_dword(tm->tm_wday);
+ replay_put_dword(tm->tm_yday);
+ replay_put_dword(tm->tm_isdst);
+ }
+}
+
+void replay_read_tm(struct tm *tm)
+{
+ replay_exec_instructions();
+
+ if (replay_file) {
+ skip_async_events_until(EVENT_TM);
+
+ tm->tm_sec = replay_get_dword();
+ tm->tm_min = replay_get_dword();
+ tm->tm_hour = replay_get_dword();
+ tm->tm_mday = replay_get_dword();
+ tm->tm_mon = replay_get_dword();
+ tm->tm_year = replay_get_dword();
+ tm->tm_wday = replay_get_dword();
+ tm->tm_yday = replay_get_dword();
+ tm->tm_isdst = replay_get_dword();
+
+ replay_check_error();
+ replay_has_unread_data = 0;
+
+ return;
+ }
+
+ fprintf(stderr, "REPLAY INTERNAL ERROR %d\n", __LINE__);
+ exit(1);
+}
+
+time_t replay_time(void)
+{
+ time_t systime;
+
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ systime = time(NULL);
+ replay_save_time_t(systime);
+ } else if (replay_mode == REPLAY_MODE_PLAY) {
+ systime = replay_read_time_t();
+ } else {
+ systime = time(NULL);
+ }
+
+ return systime;
+}
diff --git a/replay/replay.h b/replay/replay.h
index 1c18c0e..0c02e03 100755
--- a/replay/replay.h
+++ b/replay/replay.h
@@ -14,6 +14,7 @@
#include <stdbool.h>
#include <stdint.h>
+#include <time.h>
#include "qapi-types.h"
/* replay clock kinds */
@@ -69,6 +70,13 @@ int64_t replay_read_clock(unsigned int kind);
: replay_mode == REPLAY_MODE_RECORD \
? replay_save_clock((clock), (value)) \
: (value))
+/*! Returns result of time() function execution in normal and record modes.
+ In play mode returns value read from the log. */
+time_t replay_time(void);
+/*! Saves struct tm value to the log */
+void replay_save_tm(struct tm *tm);
+/*! Reads struct tm value from the log. Stops execution in case of error */
+void replay_read_tm(struct tm *tm);
/* Asynchronous events queue */
diff --git a/vl.c b/vl.c
index 7786b2f..f4be08c 100644
--- a/vl.c
+++ b/vl.c
@@ -118,6 +118,7 @@ int main(int argc, char **argv)
#include "qapi/opts-visitor.h"
#include "qom/object_interfaces.h"
#include "qapi-event.h"
+#include "replay/replay.h"
#define DEFAULT_RAM_SIZE 128
@@ -715,7 +716,7 @@ void vm_start(void)
/***********************************************************/
/* host time/date access */
-void qemu_get_timedate(struct tm *tm, int offset)
+void qemu_get_timedate_no_warning(struct tm *tm, int offset)
{
time_t ti;
@@ -732,6 +733,16 @@ void qemu_get_timedate(struct tm *tm, int offset)
}
}
+/* host time/date access with replay warning */
+void qemu_get_timedate(struct tm *tm, int offset)
+{
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ fprintf(stderr, "REPLAY WARNING! qemu_get_timedate "
+ "function may lead to non-determinism\n");
+ }
+ qemu_get_timedate_no_warning(tm, offset);
+}
+
int qemu_timedate_diff(struct tm *tm)
{
time_t seconds;
@@ -747,7 +758,7 @@ int qemu_timedate_diff(struct tm *tm)
else
seconds = mktimegm(tm) + rtc_date_offset;
- return seconds - time(NULL);
+ return seconds - replay_time();
}
static void configure_rtc_date_offset(const char *startdate, int legacy)
@@ -785,7 +796,7 @@ static void configure_rtc_date_offset(const char *startdate, int legacy)
"'2006-06-17T16:01:21' or '2006-06-17'\n");
exit(1);
}
- rtc_date_offset = time(NULL) - rtc_start_date;
+ rtc_date_offset = replay_time() - rtc_start_date;
}
}
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 ` Pavel Dovgalyuk [this message]
2015-01-12 12:08 ` [Qemu-devel] [RFC PATCH v7 13/21] replay: recording and replaying different timers 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 ` [Qemu-devel] [RFC PATCH v7 19/21] replay: initialization and deinitialization Pavel Dovgalyuk
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=20150112120100.3504.6785.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).