From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO3y9-0007uV-JZ for qemu-devel@nongnu.org; Wed, 18 Feb 2015 07:43:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO3y6-0007FR-Cs for qemu-devel@nongnu.org; Wed, 18 Feb 2015 07:43:09 -0500 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:55077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO3y6-0007FD-2k for qemu-devel@nongnu.org; Wed, 18 Feb 2015 07:43:06 -0500 Received: by mail-wg0-f44.google.com with SMTP id k14so933562wgh.3 for ; Wed, 18 Feb 2015 04:43:05 -0800 (PST) Sender: Paolo Bonzini Message-ID: <54E488D4.7040707@redhat.com> Date: Wed, 18 Feb 2015 13:43:00 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <20150218115534.4176.12578.stgit@PASHA-ISP> <20150218115603.4176.35365.stgit@PASHA-ISP> In-Reply-To: <20150218115603.4176.35365.stgit@PASHA-ISP> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH v9 04/23] replay: internal functions for replay log List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , 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, afaerber@suse.de, fred.konrad@greensocs.com On 18/02/2015 12:56, Pavel Dovgalyuk wrote: > This patch adds functions to perform read and write operations > with replay log. > > Signed-off-by: Pavel Dovgalyuk > --- > replay/Makefile.objs | 1 > replay/replay-internal.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++ > replay/replay-internal.h | 44 ++++++++++++++ > 3 files changed, 188 insertions(+), 0 deletions(-) > create mode 100755 replay/replay-internal.c > create mode 100755 replay/replay-internal.h > > diff --git a/replay/Makefile.objs b/replay/Makefile.objs > index 7ea860f..1148f45 100755 > --- a/replay/Makefile.objs > +++ b/replay/Makefile.objs > @@ -1 +1,2 @@ > obj-y += replay.o > +obj-y += replay-internal.o > diff --git a/replay/replay-internal.c b/replay/replay-internal.c > new file mode 100755 > index 0000000..e905de8 > --- /dev/null > +++ b/replay/replay-internal.c > @@ -0,0 +1,143 @@ > +/* > + * replay-internal.c > + * > + * Copyright (c) 2010-2015 Institute for System Programming > + * of the Russian Academy of Sciences. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#include "qemu-common.h" > +#include "replay-internal.h" > + > +unsigned int replay_data_kind = -1; > +unsigned int replay_has_unread_data; > + > +/* File for replay writing */ > +FILE *replay_file; > + > +void replay_put_byte(uint8_t byte) > +{ > + if (replay_file) { > + putc(byte, replay_file); > + } > +} > + > +void replay_put_event(uint8_t event) > +{ > + replay_put_byte(event); > +} > + > + > +void replay_put_word(uint16_t word) > +{ > + replay_put_byte(word >> 8); > + replay_put_byte(word); > +} > + > +void replay_put_dword(uint32_t dword) > +{ > + replay_put_word(dword >> 16); > + replay_put_word(dword); > +} > + > +void replay_put_qword(int64_t qword) > +{ > + replay_put_dword(qword >> 32); > + replay_put_dword(qword); > +} > + > +void replay_put_array(const uint8_t *buf, size_t size) > +{ > + if (replay_file) { > + replay_put_dword(size); > + fwrite(buf, 1, size, replay_file); > + } > +} > + > +uint8_t replay_get_byte(void) > +{ > + uint8_t byte = 0; > + if (replay_file) { > + byte = getc(replay_file); > + } > + return byte; > +} > + > +uint16_t replay_get_word(void) > +{ > + uint16_t word = 0; > + if (replay_file) { > + word = replay_get_byte(); > + word = (word << 8) + replay_get_byte(); > + } > + > + return word; > +} > + > +uint32_t replay_get_dword(void) > +{ > + uint32_t dword = 0; > + if (replay_file) { > + dword = replay_get_word(); > + dword = (dword << 16) + replay_get_word(); > + } > + > + return dword; > +} > + > +int64_t replay_get_qword(void) > +{ > + int64_t qword = 0; > + if (replay_file) { > + qword = replay_get_dword(); > + qword = (qword << 32) + replay_get_dword(); > + } > + > + return qword; > +} > + > +void replay_get_array(uint8_t *buf, size_t *size) > +{ > + if (replay_file) { > + *size = replay_get_dword(); > + fread(buf, 1, *size, replay_file); > + } > +} > + > +void replay_get_array_alloc(uint8_t **buf, size_t *size) > +{ > + if (replay_file) { > + *size = replay_get_dword(); > + *buf = g_malloc(*size); > + fread(*buf, 1, *size, replay_file); > + } > +} > + > +void replay_check_error(void) > +{ > + if (replay_file) { > + if (feof(replay_file)) { > + fprintf(stderr, "replay file is over\n"); I suggest using error_report (that will also require removal of the \n) but apart from this nit: Reviewed-by: Paolo Bonzini > + qemu_system_vmstop_request_prepare(); > + qemu_system_vmstop_request(RUN_STATE_PAUSED); > + } else if (ferror(replay_file)) { > + fprintf(stderr, "replay file is over or something goes wrong\n"); > + qemu_system_vmstop_request_prepare(); > + qemu_system_vmstop_request(RUN_STATE_INTERNAL_ERROR); > + } > + } > +} > + > +void replay_fetch_data_kind(void) > +{ > + if (replay_file) { > + if (!replay_has_unread_data) { > + replay_data_kind = replay_get_byte(); > + replay_check_error(); > + replay_has_unread_data = 1; > + } > + } > +} > diff --git a/replay/replay-internal.h b/replay/replay-internal.h > new file mode 100755 > index 0000000..d1b7575 > --- /dev/null > +++ b/replay/replay-internal.h > @@ -0,0 +1,44 @@ > +#ifndef REPLAY_INTERNAL_H > +#define REPLAY_INTERNAL_H > + > +/* > + * replay-internal.h > + * > + * Copyright (c) 2010-2015 Institute for System Programming > + * of the Russian Academy of Sciences. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#include > + > +extern unsigned int replay_data_kind; > +extern unsigned int replay_has_unread_data; > + > +/* File for replay writing */ > +extern FILE *replay_file; > + > +void replay_put_byte(uint8_t byte); > +void replay_put_event(uint8_t event); > +void replay_put_word(uint16_t word); > +void replay_put_dword(uint32_t dword); > +void replay_put_qword(int64_t qword); > +void replay_put_array(const uint8_t *buf, size_t size); > + > +uint8_t replay_get_byte(void); > +uint16_t replay_get_word(void); > +uint32_t replay_get_dword(void); > +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); > + > +/*! Checks error status of the file. */ > +void replay_check_error(void); > + > +/*! Reads data type from the file and stores it in the > + replay_data_kind variable. */ > +void replay_fetch_data_kind(void); > + > +#endif >