[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 15/19] tests/plugins: make howvec clean-up after itself.
From: |
Alex Bennée |
Subject: |
[PATCH v3 15/19] tests/plugins: make howvec clean-up after itself. |
Date: |
Tue, 25 Feb 2020 12:47:06 +0000 |
TCG plugins are responsible for their own memory usage and although
the plugin_exit is tied to the end of execution in this case it is
still poor practice. Ensure we delete the hash table and related data
when we are done to be a good plugin citizen.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Robert Foley <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
v2
- re-use counts for g_list_sort() as it modifies list
- drop it list
squash! tests/plugins: make howvec clean-up after itself.
---
tests/plugin/howvec.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/tests/plugin/howvec.c b/tests/plugin/howvec.c
index 4ca555e1239..3b9a6939f23 100644
--- a/tests/plugin/howvec.c
+++ b/tests/plugin/howvec.c
@@ -163,6 +163,13 @@ static gint cmp_exec_count(gconstpointer a, gconstpointer
b)
return ea->count > eb->count ? -1 : 1;
}
+static void free_record(gpointer data)
+{
+ InsnExecCount *rec = (InsnExecCount *) data;
+ g_free(rec->insn);
+ g_free(rec);
+}
+
static void plugin_exit(qemu_plugin_id_t id, void *p)
{
g_autoptr(GString) report = g_string_new("Instruction Classes:\n");
@@ -195,30 +202,31 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
counts = g_hash_table_get_values(insns);
if (counts && g_list_next(counts)) {
- GList *it;
-
g_string_append_printf(report,"Individual Instructions:\n");
+ counts = g_list_sort(counts, cmp_exec_count);
- it = g_list_sort(counts, cmp_exec_count);
-
- for (i = 0; i < limit && it->next; i++, it = it->next) {
- InsnExecCount *rec = (InsnExecCount *) it->data;
- g_string_append_printf(report, "Instr: %-24s\t(%ld
hits)\t(op=%#08x/%s)\n",
+ for (i = 0; i < limit && g_list_next(counts);
+ i++, counts = g_list_next(counts)) {
+ InsnExecCount *rec = (InsnExecCount *) counts->data;
+ g_string_append_printf(report,
+ "Instr: %-24s\t(%ld hits)\t(op=%#08x/%s)\n",
rec->insn,
rec->count,
rec->opcode,
rec->class ?
rec->class->class : "un-categorised");
}
- g_list_free(it);
+ g_list_free(counts);
}
+ g_hash_table_destroy(insns);
+
qemu_plugin_outs(report->str);
}
static void plugin_init(void)
{
- insns = g_hash_table_new(NULL, g_direct_equal);
+ insns = g_hash_table_new_full(NULL, g_direct_equal, NULL, &free_record);
}
static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata)
--
2.20.1
- Re: [PATCH v3 08/19] tests/iotests: be a little more forgiving on the size test, (continued)
- [PATCH v3 10/19] docs/devel: document query handle lifetimes, Alex Bennée, 2020/02/25
- [PATCH v3 13/19] qemu/bitops.h: Add extract8 and extract16, Alex Bennée, 2020/02/25
- [PATCH v3 11/19] plugins/core: add missing break in cb_to_tcg_flags, Alex Bennée, 2020/02/25
- [PATCH v3 12/19] tests/plugin: prevent uninitialized warning, Alex Bennée, 2020/02/25
- [PATCH v3 19/19] tests/tcg: take into account expected clashes pauth-4, Alex Bennée, 2020/02/25
- [PATCH v3 16/19] tests/tcg: give debug builds a little bit longer, Alex Bennée, 2020/02/25
- [PATCH v3 15/19] tests/plugins: make howvec clean-up after itself.,
Alex Bennée <=
- [PATCH v3 17/19] tcg: save vaddr temp for plugin usage, Alex Bennée, 2020/02/25
- [PATCH v3 18/19] tests/tcg: fix typo in configure.sh test for v8.3, Alex Bennée, 2020/02/25
- [PATCH v3 14/19] target/riscv: progressively load the instruction during decode, Alex Bennée, 2020/02/25
- Re: [PATCH v3 00/19] testing & plugin updates, no-reply, 2020/02/26