qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alistair Francis" <alistair.francis@wdc.com>,
	"Michael Roth" <michael.roth@amd.com>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
	"Yoshinori Sato" <ysato@users.sourceforge.jp>,
	"Weiwei Li" <liwei1518@gmail.com>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
	"Eric Auger" <eric.auger@redhat.com>,
	"Song Gao" <gaosong@loongson.cn>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-arm@nongnu.org, "Peter Xu" <peterx@redhat.com>,
	"Jiri Pirko" <jiri@resnulli.us>, "Eric Blake" <eblake@redhat.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	qemu-s390x@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
	"John Snow" <jsnow@redhat.com>,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	"Konstantin Kostiuk" <kkostiuk@redhat.com>,
	"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Ilya Leoshkevich" <iii@linux.ibm.com>,
	qemu-riscv@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Jason Wang" <jasowang@redhat.com>,
	"Bin Meng" <bmeng.cn@gmail.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Nicholas Piggin" <npiggin@gmail.com>
Subject: [PATCH v2 10/21] scripts/replay-dump.py: rejig decoders in event number order
Date: Tue, 13 Aug 2024 21:23:18 +0100	[thread overview]
Message-ID: <20240813202329.1237572-11-alex.bennee@linaro.org> (raw)
In-Reply-To: <20240813202329.1237572-1-alex.bennee@linaro.org>

From: Nicholas Piggin <npiggin@gmail.com>

Sort decoder functions to be ascending in order of event number,
same as the decoder tables.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20240813050638.446172-3-npiggin@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 scripts/replay-dump.py | 56 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py
index 419ee3257b..b82659cfb6 100755
--- a/scripts/replay-dump.py
+++ b/scripts/replay-dump.py
@@ -139,6 +139,19 @@ def swallow_bytes(eid, name, dumpfile, nr):
     """Swallow nr bytes of data without looking at it"""
     dumpfile.seek(nr, os.SEEK_CUR)
 
+total_insns = 0
+
+def decode_instruction(eid, name, dumpfile):
+    global total_insns
+    ins_diff = read_dword(dumpfile)
+    total_insns += ins_diff
+    print_event(eid, name, "+ %d -> %d" % (ins_diff, total_insns))
+    return True
+
+def decode_interrupt(eid, name, dumpfile):
+    print_event(eid, name)
+    return True
+
 def decode_exception(eid, name, dumpfile):
     print_event(eid, name)
     return True
@@ -198,15 +211,6 @@ def decode_async_net(eid, name, dumpfile):
     print_event(eid, name, "net:%x flags:%x bytes:%d" % (net_id, flags, size))
     return True
 
-total_insns = 0
-
-def decode_instruction(eid, name, dumpfile):
-    global total_insns
-    ins_diff = read_dword(dumpfile)
-    total_insns += ins_diff
-    print_event(eid, name, "+ %d -> %d" % (ins_diff, total_insns))
-    return True
-
 def decode_shutdown(eid, name, dumpfile):
     print_event(eid, name)
     return True
@@ -222,6 +226,21 @@ def decode_audio_out(eid, name, dumpfile):
     print_event(eid, name, "%d" % (audio_data))
     return True
 
+def decode_random(eid, name, dumpfile):
+    ret = read_dword(dumpfile)
+    size = read_dword(dumpfile)
+    swallow_bytes(eid, name, dumpfile, size)
+    if (ret):
+        print_event(eid, name, "%d bytes (getrandom failed)" % (size))
+    else:
+        print_event(eid, name, "%d bytes" % (size))
+    return True
+
+def decode_clock(eid, name, dumpfile):
+    clock_data = read_qword(dumpfile)
+    print_event(eid, name, "0x%x" % (clock_data))
+    return True
+
 def __decode_checkpoint(eid, name, dumpfile, old):
     """Decode a checkpoint.
 
@@ -252,25 +271,6 @@ def decode_checkpoint_init(eid, name, dumpfile):
     print_event(eid, name)
     return True
 
-def decode_interrupt(eid, name, dumpfile):
-    print_event(eid, name)
-    return True
-
-def decode_clock(eid, name, dumpfile):
-    clock_data = read_qword(dumpfile)
-    print_event(eid, name, "0x%x" % (clock_data))
-    return True
-
-def decode_random(eid, name, dumpfile):
-    ret = read_dword(dumpfile)
-    size = read_dword(dumpfile)
-    swallow_bytes(eid, name, dumpfile, size)
-    if (ret):
-        print_event(eid, name, "%d bytes (getrandom failed)" % (size))
-    else:
-        print_event(eid, name, "%d bytes" % (size))
-    return True
-
 def decode_end(eid, name, dumpfile):
     print_event(eid, name)
     return False
-- 
2.39.2



  parent reply	other threads:[~2024-08-13 20:27 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-13 20:23 [PATCH v2 00/21] Various fixes and tweaks for 9.1-rc2/3 Alex Bennée
2024-08-13 20:23 ` [PATCH v2 01/21] tests/avocado: Re-enable gdbsim-r5f562n8 testing U-Boot Alex Bennée
2024-08-13 20:23 ` [PATCH v2 02/21] Makefile: trigger re-configure on updated pythondeps Alex Bennée
2024-08-13 20:23 ` [PATCH v2 03/21] configure: Fix arch detection for GDB_HAS_MTE Alex Bennée
2024-08-13 20:23 ` [PATCH v2 04/21] configure: Avoid use of param. expansion when using gdb_version Alex Bennée
2024-08-13 20:23 ` [PATCH v2 05/21] configure: Fix GDB version detection for GDB_HAS_MTE Alex Bennée
2024-08-13 20:23 ` [PATCH v2 06/21] scripts/checkpatch: more checks on files imported from Linux Alex Bennée
2024-08-13 20:23 ` [PATCH v2 07/21] target/i386: allow access_ptr to force slow path on failed probe Alex Bennée
2024-08-14  1:55   ` Richard Henderson
2024-08-13 20:23 ` [PATCH v2 08/21] buildsys: Fix building without plugins on Darwin Alex Bennée
2024-08-14  8:29   ` Philippe Mathieu-Daudé
2024-08-13 20:23 ` [PATCH v2 09/21] scripts/replay-dump.py: Update to current rr record format Alex Bennée
2024-08-13 20:23 ` Alex Bennée [this message]
2024-08-13 20:23 ` [PATCH v2 11/21] tests/avocado: excercise scripts/replay-dump.py in replay tests Alex Bennée
2024-08-13 20:23 ` [PATCH v2 12/21] replay: allow runstate shutdown->running when replaying trace Alex Bennée
2024-08-13 20:23 ` [PATCH v2 13/21] Revert "replay: stop us hanging in rr_wait_io_event" Alex Bennée
2024-08-13 20:23 ` [PATCH v2 14/21] tests/avocado: replay_kernel.py add x86-64 q35 machine test Alex Bennée
2024-08-13 20:23 ` [PATCH v2 15/21] chardev: set record/replay on the base device of a muxed device Alex Bennée
2024-08-13 20:23 ` [PATCH v2 16/21] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state Alex Bennée
2024-08-13 20:48   ` Michael S. Tsirkin
2024-08-14  6:05     ` Nicholas Piggin
2024-08-14  7:06       ` Michael S. Tsirkin
2024-08-14 17:25         ` Alex Bennée
2024-08-15  7:12           ` Nicholas Piggin
2024-08-15 14:28             ` Michael S. Tsirkin
2024-08-16  2:26               ` Nicholas Piggin
2024-08-16  2:31               ` Jason Wang
2024-08-16 12:58                 ` Alex Bennée
2024-08-13 20:23 ` [PATCH v2 17/21] virtio-net: Use virtual time for RSC timers Alex Bennée
2024-08-13 20:49   ` Michael S. Tsirkin
2024-08-13 20:23 ` [PATCH v2 18/21] savevm: Fix load_snapshot error path crash Alex Bennée
2024-08-13 20:23 ` [PATCH v2 19/21] docs: Fix some typos (found by typos) and grammar issues Alex Bennée
2024-08-13 20:23 ` [PATCH v2 20/21] docs/devel: update tcg-plugins page Alex Bennée
2024-08-13 20:23 ` [PATCH v2 21/21] plugins: fix race condition with scoreboards Alex Bennée

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=20240813202329.1237572-11-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=alistair.francis@wdc.com \
    --cc=armbru@redhat.com \
    --cc=bleal@redhat.com \
    --cc=bmeng.cn@gmail.com \
    --cc=crosa@redhat.com \
    --cc=david@redhat.com \
    --cc=dbarboza@ventanamicro.com \
    --cc=eblake@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=erdnaxe@crans.org \
    --cc=eric.auger@redhat.com \
    --cc=farosas@suse.de \
    --cc=gaosong@loongson.cn \
    --cc=iii@linux.ibm.com \
    --cc=jasowang@redhat.com \
    --cc=jiri@resnulli.us \
    --cc=jsnow@redhat.com \
    --cc=kkostiuk@redhat.com \
    --cc=liwei1518@gmail.com \
    --cc=ma.mandourr@gmail.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=michael.roth@amd.com \
    --cc=mst@redhat.com \
    --cc=npiggin@gmail.com \
    --cc=palmer@dabbelt.com \
    --cc=pavel.dovgaluk@ispras.ru \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=pierrick.bouvier@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=ysato@users.sourceforge.jp \
    --cc=zhiwei_liu@linux.alibaba.com \
    /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).