From nobody Tue Feb 10 02:43:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626108730702552.8594215632161; Mon, 12 Jul 2021 09:52:10 -0700 (PDT) Received: from localhost ([::1]:54484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2zA9-0003A7-Nm for importer@patchew.org; Mon, 12 Jul 2021 12:52:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2z8c-0000M6-JG for qemu-devel@nongnu.org; Mon, 12 Jul 2021 12:50:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2z8a-0002Q4-O8 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 12:50:34 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-566-t-kOTsU8O-qRRLnLZyv0xg-1; Mon, 12 Jul 2021 12:50:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 765051084F56; Mon, 12 Jul 2021 16:50:29 +0000 (UTC) Received: from localhost (ovpn-112-230.ams2.redhat.com [10.36.112.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17ADE5D9CA; Mon, 12 Jul 2021 16:50:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626108632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xJcxWwSjmJylz7AT/BUftWVhBLWaqj8nNir0VLXnYyQ=; b=MYK4CTFAMcnaYntk+ClU18EjGxNC9qxpG7a3ky8fkvkHhIDvLYQEnkjNa59ow6xSpv+2OT clGg/jaystVKqvEYwCe9xmCn+RcT+8ceG7FGOq96OpbLbvcZzbmiKYxvkPpku01te1QQ5J g0wcZShiPzI7rn1v3XhfYoMjKvWMX7Y= X-MC-Unique: t-kOTsU8O-qRRLnLZyv0xg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 3/6] trace: add trace_event_iter_init_group Date: Mon, 12 Jul 2021 17:49:58 +0100 Message-Id: <20210712165001.429113-4-stefanha@redhat.com> In-Reply-To: <20210712165001.429113-1-stefanha@redhat.com> References: <20210712165001.429113-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 1 X-Spam_score: 0.1 X-Spam_bar: / X-Spam_report: (0.1 / 5.0 requ) DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Markus Armbruster , Gerd Hoffmann , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1626108731123100001 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann This allows to interate over an event group. Signed-off-by: Gerd Hoffmann Reviewed-by: Stefan Hajnoczi Message-id: 20210601132414.432430-4-kraxel@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/control.h | 13 +++++++++++++ trace/control.c | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/trace/control.h b/trace/control.h index ce40bd0405..23b8393b29 100644 --- a/trace/control.h +++ b/trace/control.h @@ -13,8 +13,11 @@ #include "event-internal.h" =20 typedef struct TraceEventIter { + /* iter state */ size_t event; size_t group; + /* filter conditions */ + size_t group_id; const char *pattern; } TraceEventIter; =20 @@ -39,6 +42,16 @@ void trace_event_iter_init_all(TraceEventIter *iter); */ void trace_event_iter_init_pattern(TraceEventIter *iter, const char *patte= rn); =20 +/** + * trace_event_iter_init_group: + * @iter: the event iterator struct + * @group_id: group_id to filter events by group. + * + * Initialize the event iterator struct @iter, + * using @group_id to filter for events in the group. + */ +void trace_event_iter_init_group(TraceEventIter *iter, size_t group_id); + /** * trace_event_iter_next: * @iter: the event iterator struct diff --git a/trace/control.c b/trace/control.c index ed38e813b2..2c904b7ee4 100644 --- a/trace/control.c +++ b/trace/control.c @@ -104,6 +104,7 @@ void trace_event_iter_init_all(TraceEventIter *iter) { iter->event =3D 0; iter->group =3D 0; + iter->group_id =3D -1; iter->pattern =3D NULL; } =20 @@ -113,20 +114,32 @@ void trace_event_iter_init_pattern(TraceEventIter *it= er, const char *pattern) iter->pattern =3D pattern; } =20 +void trace_event_iter_init_group(TraceEventIter *iter, size_t group_id) +{ + trace_event_iter_init_all(iter); + iter->group_id =3D group_id; +} + TraceEvent *trace_event_iter_next(TraceEventIter *iter) { while (iter->group < nevent_groups && event_groups[iter->group].events[iter->event] !=3D NULL) { TraceEvent *ev =3D event_groups[iter->group].events[iter->event]; + size_t group =3D iter->group; iter->event++; if (event_groups[iter->group].events[iter->event] =3D=3D NULL) { iter->event =3D 0; iter->group++; } - if (!iter->pattern || - g_pattern_match_simple(iter->pattern, trace_event_get_name(ev)= )) { - return ev; + if (iter->pattern && + !g_pattern_match_simple(iter->pattern, trace_event_get_name(ev= ))) { + continue; } + if (iter->group_id !=3D -1 && + iter->group_id !=3D group) { + continue; + } + return ev; } =20 return NULL; --=20 2.31.1