From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH v3 1/8] meson: add trace_events_config[]
Date: Thu, 21 Jan 2021 13:50:21 +0100 [thread overview]
Message-ID: <20210121125028.3247190-2-kraxel@redhat.com> (raw)
In-Reply-To: <20210121125028.3247190-1-kraxel@redhat.com>
It's an array of dicts, where each dict holds the configuration for one
trace-events file. For now just fill it from trace_events_subdirs.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
meson.build | 1 +
trace/meson.build | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index af2bc8974111..1f3d48b53a06 100644
--- a/meson.build
+++ b/meson.build
@@ -1677,6 +1677,7 @@ target_softmmu_arch = {}
# TODO: add each directory to the subdirs from its own meson.build, once
# we have those
+trace_events_config = []
trace_events_subdirs = [
'accel/kvm',
'accel/tcg',
diff --git a/trace/meson.build b/trace/meson.build
index a0be8f9b0db9..3a2b39dd6291 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -2,12 +2,23 @@
specific_ss.add(files('control-target.c'))
trace_events_files = []
-foreach dir : [ '.' ] + trace_events_subdirs
- trace_events_file = meson.source_root() / dir / 'trace-events'
+
+trace_events_config += {
+ 'file' : meson.source_root() / 'trace-events',
+ 'group' : 'root',
+}
+foreach dir : trace_events_subdirs
+ trace_events_config += {
+ 'file' : meson.source_root() / dir / 'trace-events',
+ 'group' : dir.underscorify(),
+ }
+endforeach
+
+foreach c : trace_events_config
+ trace_events_file = c.get('file')
trace_events_files += [ trace_events_file ]
- group_name = dir == '.' ? 'root' : dir.underscorify()
- group = '--group=' + group_name
- fmt = '@0@-' + group_name + '.@1@'
+ group = '--group=' + c.get('group')
+ fmt = '@0@-' + c.get('group') + '.@1@'
trace_h = custom_target(fmt.format('trace', 'h'),
output: fmt.format('trace', 'h'),
--
2.29.2
next prev parent reply other threads:[~2021-01-21 12:52 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 12:50 [PATCH v3 0/8] [RfC] fix tracing for modules Gerd Hoffmann
2021-01-21 12:50 ` Gerd Hoffmann [this message]
2021-01-27 14:48 ` [PATCH v3 1/8] meson: add trace_events_config[] Stefan Hajnoczi
2021-01-21 12:50 ` [PATCH v3 2/8] meson: move up hw subdir (specifically before trace subdir) Gerd Hoffmann
2021-01-27 14:49 ` Stefan Hajnoczi
2021-01-21 12:50 ` [PATCH v3 3/8] meson: add module_trace & module_trace_src Gerd Hoffmann
2021-01-27 15:03 ` Stefan Hajnoczi
2021-01-21 12:50 ` [PATCH v3 4/8] meson: move qxl trace events to separate file Gerd Hoffmann
2021-01-27 15:33 ` Stefan Hajnoczi
2021-03-22 11:43 ` Daniel P. Berrangé
2021-01-21 12:50 ` [PATCH v3 5/8] trace: iter init tweaks Gerd Hoffmann
2021-02-03 16:13 ` Stefan Hajnoczi
2021-01-21 12:50 ` [PATCH v3 6/8] trace: add trace_event_iter_init_group Gerd Hoffmann
2021-02-03 16:16 ` Stefan Hajnoczi
2021-01-21 12:50 ` [PATCH v3 7/8] trace/simple: pass iter to st_write_event_mapping Gerd Hoffmann
2021-02-03 16:17 ` Stefan Hajnoczi
2021-01-21 12:50 ` [PATCH v3 8/8] trace/simple: add st_init_group Gerd Hoffmann
2021-02-03 16:22 ` Stefan Hajnoczi
2021-02-03 16:32 ` [PATCH v3 0/8] [RfC] fix tracing for modules Stefan Hajnoczi
2021-02-22 15:13 ` Gerd Hoffmann
2021-03-22 11:36 ` Stefan Hajnoczi
2021-03-22 11:46 ` Daniel P. Berrangé
2021-03-29 16:32 ` Stefan Hajnoczi
2021-03-22 12:03 ` Daniel P. Berrangé
2021-03-26 12:47 ` Gerd Hoffmann
2021-03-29 9:23 ` Daniel P. Berrangé
2021-03-29 9:48 ` Gerd Hoffmann
2021-03-29 10:02 ` Daniel P. Berrangé
2021-03-31 10:55 ` Gerd Hoffmann
2021-04-09 9:10 ` Gerd Hoffmann
2021-04-09 13:12 ` Gerd Hoffmann
2021-04-09 13:17 ` Daniel P. Berrangé
2021-04-12 13:07 ` Gerd Hoffmann
2021-04-15 13:10 ` Daniel P. Berrangé
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=20210121125028.3247190-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@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).