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: "Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Akihiko Odaki" <akihiko.odaki@daynix.com>,
	"John Snow" <jsnow@redhat.com>, "Fabiano Rosas" <farosas@suse.de>,
	"Peter Xu" <peterx@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	"Markus Armbruster" <armbru@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Sriram Yagnaraman" <sriram.yagnaraman@ericsson.com>,
	"Dmitry Osipenko" <dmitry.osipenko@collabora.com>,
	"Gustavo Romero" <gustavo.romero@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH v3 07/20] contrib/plugins: add a scaling factor to the ips arg
Date: Wed, 21 May 2025 17:42:37 +0100	[thread overview]
Message-ID: <20250521164250.135776-8-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250521164250.135776-1-alex.bennee@linaro.org>

It's easy to get lost in zeros while setting the numbers of
instructions per second. Add a scaling suffix to make things simpler.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

---
v2
  - normalise the suffix before a full strcmp0
  - check endptr actually set
  - fix checkpatch
  - scale_entry -> ScaleEntry
  - drop hz from suffix
---
 contrib/plugins/ips.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/contrib/plugins/ips.c b/contrib/plugins/ips.c
index e5297dbb01..eb4418c25b 100644
--- a/contrib/plugins/ips.c
+++ b/contrib/plugins/ips.c
@@ -129,6 +129,18 @@ static void plugin_exit(qemu_plugin_id_t id, void *udata)
     qemu_plugin_scoreboard_free(vcpus);
 }
 
+typedef struct {
+    const char *suffix;
+    unsigned long multipler;
+} ScaleEntry;
+
+/* a bit like units.h but not binary */
+static ScaleEntry scales[] = {
+    { "k", 1000 },
+    { "m", 1000 * 1000 },
+    { "g", 1000 * 1000 * 1000 },
+};
+
 QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
                                            const qemu_info_t *info, int argc,
                                            char **argv)
@@ -137,12 +149,32 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
         char *opt = argv[i];
         g_auto(GStrv) tokens = g_strsplit(opt, "=", 2);
         if (g_strcmp0(tokens[0], "ips") == 0) {
-            max_insn_per_second = g_ascii_strtoull(tokens[1], NULL, 10);
+            char *endptr = NULL;
+            max_insn_per_second = g_ascii_strtoull(tokens[1], &endptr, 10);
             if (!max_insn_per_second && errno) {
                 fprintf(stderr, "%s: couldn't parse %s (%s)\n",
                         __func__, tokens[1], g_strerror(errno));
                 return -1;
             }
+
+            if (endptr && *endptr != 0) {
+                g_autofree gchar *lower = g_utf8_strdown(endptr, -1);
+                unsigned long scale = 0;
+
+                for (int j = 0; j < G_N_ELEMENTS(scales); j++) {
+                    if (g_strcmp0(lower, scales[j].suffix) == 0) {
+                        scale = scales[j].multipler;
+                        break;
+                    }
+                }
+
+                if (scale) {
+                    max_insn_per_second *= scale;
+                } else {
+                    fprintf(stderr, "bad suffix: %s\n", endptr);
+                    return -1;
+                }
+            }
         } else {
             fprintf(stderr, "option parsing failed: %s\n", opt);
             return -1;
-- 
2.39.5



  parent reply	other threads:[~2025-05-21 16:46 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-21 16:42 [PATCH v3 00/20] Maintainer updates for May (testing, plugins, virtio-gpu) - pre-PR Alex Bennée
2025-05-21 16:42 ` [PATCH v3 01/20] tests/docker: expose $HOME/.cache/qemu as docker volume Alex Bennée
2025-05-22  5:23   ` Thomas Huth
2025-05-21 16:42 ` [PATCH v3 02/20] gitlab: disable debug info on CI builds Alex Bennée
2025-05-21 16:42 ` [PATCH v3 03/20] tests/tcg: make aarch64 boot.S handle different starting modes Alex Bennée
2025-05-22  5:10   ` Akihiko Odaki
2025-05-21 16:42 ` [PATCH v3 04/20] tests/qtest: fix igb test failure under --enable-ubsan Alex Bennée
2025-05-22  5:19   ` Akihiko Odaki
2025-05-25 15:18     ` Philippe Mathieu-Daudé
2025-05-21 16:42 ` [PATCH v3 05/20] tests/Makefile: include test-plugins in per-arch build deps Alex Bennée
2025-05-22  5:37   ` Akihiko Odaki
2025-05-22 10:31     ` Alex Bennée
2025-05-22 10:35       ` Akihiko Odaki
2025-05-25 15:18         ` Philippe Mathieu-Daudé
2025-05-21 16:42 ` [PATCH v3 06/20] tests/functional: Add PCI hotplug test for aarch64 Alex Bennée
2025-05-22  5:43   ` Akihiko Odaki
2025-05-21 16:42 ` Alex Bennée [this message]
2025-05-22  5:45   ` [PATCH v3 07/20] contrib/plugins: add a scaling factor to the ips arg Akihiko Odaki
2025-05-25 15:19     ` Philippe Mathieu-Daudé
2025-05-21 16:42 ` [PATCH v3 08/20] contrib/plugins: allow setting of instructions per quantum Alex Bennée
2025-05-22  5:55   ` Akihiko Odaki
2025-05-21 16:42 ` [PATCH v3 09/20] MAINTAINERS: add myself to virtio-gpu for Odd Fixes Alex Bennée
2025-05-22  5:16   ` Markus Armbruster
2025-05-21 16:42 ` [PATCH v3 10/20] MAINTAINERS: add Akihiko and Dmitry as reviewers Alex Bennée
2025-05-22  5:16   ` Markus Armbruster
2025-05-24 11:07   ` Michael S. Tsirkin
2025-05-25 15:20   ` Philippe Mathieu-Daudé
2025-05-21 16:42 ` [PATCH v3 11/20] hw/display: re-arrange memory region tracking Alex Bennée
2025-05-21 16:42 ` [PATCH v3 12/20] virtio-gpu: fix hang under TCG when unmapping blob Alex Bennée
2025-05-22  5:59   ` Akihiko Odaki
2025-05-22  6:45     ` Alex Bennée
2025-05-22  7:02       ` Akihiko Odaki
2025-05-22  7:31         ` Manos Pitsidianakis
2025-05-22  7:40           ` Akihiko Odaki
2025-05-22  9:28             ` Alex Bennée
2025-05-22  9:54               ` Akihiko Odaki
2025-05-27 10:05                 ` Alex Bennée
2025-05-27 11:03                   ` Akihiko Odaki
2025-05-21 16:42 ` [PATCH v3 13/20] virtio-gpu: refactor async blob unmapping Alex Bennée
2025-05-21 16:42 ` [PATCH v3 14/20] ui/gtk-gl-area: Remove extra draw call in refresh Alex Bennée
2025-05-21 16:42 ` [PATCH v3 15/20] virtio-gpu: support context init multiple timeline Alex Bennée
2025-05-21 16:42 ` [PATCH v3 16/20] include/exec: fix assert in size_memop Alex Bennée
2025-05-22  6:07   ` Akihiko Odaki
2025-05-21 16:42 ` [PATCH v3 17/20] include/gdbstub: fix include guard in commands.h Alex Bennée
2025-05-21 16:42 ` [PATCH v3 18/20] gdbstub: assert earlier in handle_read_all_regs Alex Bennée
2025-05-21 16:42 ` [PATCH v3 19/20] gdbstub: Implement qGDBServerVersion packet Alex Bennée
2025-05-22  6:29   ` Akihiko Odaki
2025-05-22 10:05     ` Alex Bennée
2025-05-22 10:15       ` Akihiko Odaki
2025-05-25 15:25   ` Philippe Mathieu-Daudé
2025-05-27  9:16     ` Alex Bennée
2025-05-21 16:42 ` [PATCH v3 20/20] gdbstub: update aarch64-core.xml 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=20250521164250.135776-8-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=akihiko.odaki@daynix.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=david@redhat.com \
    --cc=dmitry.osipenko@collabora.com \
    --cc=erdnaxe@crans.org \
    --cc=farosas@suse.de \
    --cc=gustavo.romero@linaro.org \
    --cc=jsnow@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=ma.mandourr@gmail.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mst@redhat.com \
    --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=sriram.yagnaraman@ericsson.com \
    --cc=thuth@redhat.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).