From nobody Mon Apr 6 19:45:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773827649; cv=none; d=zohomail.com; s=zohoarc; b=KEd17Hao0llOaIRF7U4DStpmYeVRpf3KQEz5HKrMT6y0qZlC1Qxh1w+qmh3efs8OkE6LcRqsXeXO9lOcebWephnfzvGomgbxyzPnCvvPYF7RG2VPZ8/7nB9IPjKTXQnAqbj2feHYD9/H8y+gBlaQTTi/ZBVxlymj7WuOl3ZbEdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773827649; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SLc8TUGCVbI2hNqsv8kPvh67lVtYioZvfSsq0QAiRoE=; b=eGm9NV8htVCzWgRo18lyzq2tCeYoJDd2MAvOvi2k4+BftnmxZgzTU2AxF3jlHJOUHDHMa/dyV0E6nkMCi5tsKx2Pz46ZzbedUWzE4gXDU+hjXban1FkZiQMKa3/H2e4SL2fE0YKLJA0mxXAf28SewNjSnbYbxnSyMyeLCFCKL64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773827649884489.86856927583995; Wed, 18 Mar 2026 02:54:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2nb8-0007Wm-CO; Wed, 18 Mar 2026 05:53:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2naq-0007Tj-OO for qemu-devel@nongnu.org; Wed, 18 Mar 2026 05:53:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2nal-0000BR-RL for qemu-devel@nongnu.org; Wed, 18 Mar 2026 05:53:34 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-407-dRHuYLGqMmS53YGGLQq1XQ-1; Wed, 18 Mar 2026 05:53:27 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63514195605E; Wed, 18 Mar 2026 09:53:26 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.6]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 07BCE1955F19; Wed, 18 Mar 2026 09:53:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5FD7F21E66E5; Wed, 18 Mar 2026 10:53:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773827610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SLc8TUGCVbI2hNqsv8kPvh67lVtYioZvfSsq0QAiRoE=; b=TnokTp5m9TGiVpe3hq6mHLvg2QAFpjzHhDCdc0oMhLcyeBu7995ThvZY9k32FKu39lVdsV SV/M69G0PmIOvTqhgRqtc3V0JBBB+lygej6TrgdQshuDXZrKPmYGxpmQmnVvWCAMmNKx/i xj8YI8uS7A23aKBD3fH+hL3ZYipEc84= X-MC-Unique: dRHuYLGqMmS53YGGLQq1XQ-1 X-Mimecast-MFC-AGG-ID: dRHuYLGqMmS53YGGLQq1XQ_1773827606 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: dave@treblig.org, kwolf@redhat.com Subject: [PATCH 2/3] monitor: Factor out monitor_event_rate_limited() Date: Wed, 18 Mar 2026 10:53:22 +0100 Message-ID: <20260318095323.2705117-3-armbru@redhat.com> In-Reply-To: <20260318095323.2705117-1-armbru@redhat.com> References: <20260318095323.2705117-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773827651043158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- monitor/monitor.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/monitor/monitor.c b/monitor/monitor.c index 8277f41a9d..87f6e4860b 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -319,17 +319,9 @@ static void monitor_qapi_event_emit(QAPIEvent event, Q= Dict *qdict) } } =20 -static void monitor_qapi_event_handler(void *opaque); - -/* - * Queue a new event for emission to Monitor instances, - * applying any rate limiting if required. - */ -static void -monitor_qapi_event_queue_no_reenter(QAPIEvent event, QDict *qdict) +static int64_t monitor_event_rate_limit(QAPIEvent event, QDict *data) { MonitorQAPIEventConf *evconf; - MonitorQAPIEventState *evstate; int64_t rate_limit; =20 assert(event < QAPI_EVENT__MAX); @@ -346,13 +338,28 @@ monitor_qapi_event_queue_no_reenter(QAPIEvent event, = QDict *qdict) * limited, so we can do without rate limiting. */ if (event =3D=3D QAPI_EVENT_BLOCK_IO_ERROR) { - QDict *data =3D qobject_to(QDict, qdict_get(qdict, "data")); const char *action =3D qdict_get_str(data, "action"); if (!strcmp(action, "stop")) { rate_limit =3D 0; } } =20 + return rate_limit; +} + +static void monitor_qapi_event_handler(void *opaque); + +/* + * Queue a new event for emission to Monitor instances, + * applying any rate limiting if required. + */ +static void +monitor_qapi_event_queue_no_reenter(QAPIEvent event, QDict *qdict) +{ + QDict *data =3D qobject_to(QDict, qdict_get(qdict, "data")); + int64_t rate_limit =3D monitor_event_rate_limit(event, data); + MonitorQAPIEventState *evstate; + trace_monitor_protocol_event_queue(event, qdict, rate_limit); =20 QEMU_LOCK_GUARD(&monitor_lock); @@ -361,7 +368,6 @@ monitor_qapi_event_queue_no_reenter(QAPIEvent event, QD= ict *qdict) /* Unthrottled event */ monitor_qapi_event_emit(event, qdict); } else { - QDict *data =3D qobject_to(QDict, qdict_get(qdict, "data")); MonitorQAPIEventState key =3D { .event =3D event, .data =3D data }; =20 evstate =3D g_hash_table_lookup(monitor_qapi_event_state, &key); --=20 2.53.0