On 2025/05/22 1:42, Alex Bennée wrote:
> 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;
As I suggested for the previous version, let's use uint32_t or uint64_t.
> +} 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;