From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH v2 3/4] meson: add module_trace & module_trace_src
Date: Tue, 24 Nov 2020 17:02:54 +0100 [thread overview]
Message-ID: <20201124160255.28111-4-kraxel@redhat.com> (raw)
In-Reply-To: <20201124160255.28111-1-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
meson.build | 3 ++-
trace/meson.build | 16 ++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index a85d331668fa..0000cc286120 100644
--- a/meson.build
+++ b/meson.build
@@ -1591,7 +1591,8 @@ foreach d, list : modules
foreach m, module_ss : list
if enable_modules and targetos != 'windows'
module_ss = module_ss.apply(config_all, strict: false)
- sl = static_library(d + '-' + m, [genh, module_ss.sources()],
+ module_trace_src = module_trace.get(d + '-' + m, [])
+ sl = static_library(d + '-' + m, [genh, module_ss.sources(), module_trace_src],
dependencies: [modulecommon, module_ss.dependencies()], pic: true)
if d == 'block'
block_mods += sl
diff --git a/trace/meson.build b/trace/meson.build
index 552371b84241..b4e59ce9668b 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -1,6 +1,7 @@
specific_ss.add(files('control-target.c'))
trace_events_files = []
+module_trace = {}
trace_events_config += {
'file' : meson.source_root() / 'trace-events',
@@ -18,6 +19,8 @@ foreach c : trace_events_config
trace_events_files += [ trace_events_file ]
group = '--group=' + c.get('group')
fmt = '@0@-' + c.get('group') + '.@1@'
+ mod = c.get('module', '')
+ module_trace_src = []
trace_h = custom_target(fmt.format('trace', 'h'),
output: fmt.format('trace', 'h'),
@@ -36,10 +39,10 @@ foreach c : trace_events_config
input: trace_events_file,
command: [ tracetool, group, '--format=ust-events-h', '@INPUT@' ],
capture: true)
- trace_ss.add(trace_ust_h, lttng, urcubp)
+ module_trace_src += [ trace_ust_h, lttng, urcubp ]
genh += trace_ust_h
endif
- trace_ss.add(trace_h, trace_c)
+ module_trace_src += [ trace_h, trace_c ]
if 'CONFIG_TRACE_DTRACE' in config_host
trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'),
output: fmt.format('trace-dtrace', 'dtrace'),
@@ -50,17 +53,22 @@ foreach c : trace_events_config
output: fmt.format('trace-dtrace', 'h'),
input: trace_dtrace,
command: [ 'dtrace', '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ])
- trace_ss.add(trace_dtrace_h)
+ module_trace_src += trace_dtrace_h
if host_machine.system() != 'darwin'
trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
output: fmt.format('trace-dtrace', 'o'),
input: trace_dtrace,
command: [ 'dtrace', '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ])
- trace_ss.add(trace_dtrace_o)
+ module_trace_src += trace_dtrace_o
endif
genh += trace_dtrace_h
endif
+ if enable_modules and mod != ''
+ module_trace += { mod : module_trace_src }
+ else
+ trace_ss.add(module_trace_src)
+ endif
endforeach
trace_events_all = custom_target('trace-events-all',
--
2.27.0
next prev parent reply other threads:[~2020-11-24 16:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 16:02 [PATCH v2 0/4] [RfC] fix tracing for modules Gerd Hoffmann
2020-11-24 16:02 ` [PATCH v2 1/4] meson: add trace_events_config[] Gerd Hoffmann
2020-11-24 16:02 ` [PATCH v2 2/4] meson: move up hw subdir (specifically before trace subdir) Gerd Hoffmann
2020-11-24 16:02 ` Gerd Hoffmann [this message]
2020-11-24 16:02 ` [PATCH v2 4/4] meson: move qxl trace events to separate file Gerd Hoffmann
2020-11-30 16:56 ` [PATCH v2 0/4] [RfC] fix tracing for modules Stefan Hajnoczi
2020-12-03 10:39 ` Gerd Hoffmann
2020-12-15 16:36 ` Gerd Hoffmann
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=20201124160255.28111-4-kraxel@redhat.com \
--to=kraxel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.