[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 26/40] plugins/lockstep: clean-up output
From: |
Alex Bennée |
Subject: |
[PATCH v2 26/40] plugins/lockstep: clean-up output |
Date: |
Fri, 5 Jul 2024 09:40:33 +0100 |
We were repeating information which wasn't super clear. As we already
will have dumped the last failing PC just note the divergence and dump
the previous instruction log.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
contrib/plugins/lockstep.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
index 353bf12dfb..5b7dfc9c06 100644
--- a/contrib/plugins/lockstep.c
+++ b/contrib/plugins/lockstep.c
@@ -135,10 +135,13 @@ static void report_divergance(ExecState *us, ExecState
*them)
/* Output short log entry of going out of sync... */
if (verbose || divrec.distance == 1 || diverged) {
- g_string_printf(out,
- "@ 0x%016" PRIx64 " vs 0x%016" PRIx64
+ g_string_printf(out, "@ "
+ "0x%016" PRIx64 " (%" PRId64 ") vs "
+ "0x%016" PRIx64 " (%" PRId64 ")"
" (%d/%d since last)\n",
- us->pc, them->pc, g_slist_length(divergence_log),
+ us->pc, us->insn_count,
+ them->pc, them->insn_count,
+ g_slist_length(divergence_log),
divrec.distance);
qemu_plugin_outs(out->str);
}
@@ -147,10 +150,7 @@ static void report_divergance(ExecState *us, ExecState
*them)
int i;
GSList *entry;
- g_string_printf(out,
- "Δ insn_count @ 0x%016" PRIx64
- " (%"PRId64") vs 0x%016" PRIx64 " (%"PRId64")\n",
- us->pc, us->insn_count, them->pc, them->insn_count);
+ g_string_printf(out, "Δ too high, we have diverged, previous insns\n");
for (entry = log, i = 0;
g_slist_next(entry) && i < 5;
@@ -163,7 +163,7 @@ static void report_divergance(ExecState *us, ExecState
*them)
prev->insn_count);
}
qemu_plugin_outs(out->str);
- qemu_plugin_outs("too much divergence... giving up.");
+ qemu_plugin_outs("giving up\n");
qemu_plugin_uninstall(our_id, plugin_cleanup);
}
}
--
2.39.2
- [PATCH v2 39/40] gdbstub: Add support for MTE in user mode, (continued)
- [PATCH v2 39/40] gdbstub: Add support for MTE in user mode, Alex Bennée, 2024/07/05
- [PATCH v2 37/40] gdbstub: Pass CPU context to command handler, Alex Bennée, 2024/07/05
- [PATCH v2 35/40] target/arm: Factor out code for setting MTE TCF0 field, Alex Bennée, 2024/07/05
- [PATCH v2 25/40] plugins/lockstep: mention the one-insn-per-tb option, Alex Bennée, 2024/07/05
- [PATCH v2 19/40] linux-user/main: Suppress out-of-range comparison warning for clang, Alex Bennée, 2024/07/05
- [PATCH v2 34/40] target/arm: Make some MTE helpers widely available, Alex Bennée, 2024/07/05
- [PATCH v2 32/40] gdbstub: Add support for target-specific stubs, Alex Bennée, 2024/07/05
- [PATCH v2 26/40] plugins/lockstep: clean-up output,
Alex Bennée <=
- [PATCH v2 24/40] plugins/lockstep: make mixed-mode safe, Alex Bennée, 2024/07/05
- [PATCH v2 14/40] tests/tcg/arm: Drop -N from LDFLAGS, Alex Bennée, 2024/07/05
- [PATCH v2 36/40] gdbstub: Make hex conversion function non-internal, Alex Bennée, 2024/07/05
- [PATCH v2 21/40] test/plugin: make insn plugin less noisy by default, Alex Bennée, 2024/07/05
- [PATCH v2 13/40] tests/tcg/arm: Fix fcvt result messages, Alex Bennée, 2024/07/05
- [PATCH v2 38/40] gdbstub: Use true to set cmd_startswith, Alex Bennée, 2024/07/05
- [PATCH v2 23/40] plugins/lockstep: preserve sock_path, Alex Bennée, 2024/07/05