[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 3/8] meson: add module_trace & module_trace_src
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 3/8] meson: add module_trace & module_trace_src |
Date: |
Thu, 21 Jan 2021 13:50:23 +0100 |
module_trace is a dict which keeps track of the trace source files for a
module.
module_trace_src collects the trace source files for a given trace-events file,
which then either added to the source set or to a new module_trace dict
depending on whenever they are for a module or core qemu.
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 7462a50b4c36..a073fcd301c5 100644
--- a/meson.build
+++ b/meson.build
@@ -1890,7 +1890,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 3a2b39dd6291..843b472ba943 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -2,6 +2,7 @@
specific_ss.add(files('control-target.c'))
trace_events_files = []
+module_trace = {}
trace_events_config += {
'file' : meson.source_root() / 'trace-events',
@@ -19,6 +20,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'),
@@ -34,10 +37,10 @@ foreach c : trace_events_config
output: fmt.format('trace-ust', 'h'),
input: trace_events_file,
command: [ tracetool, group,
'--format=ust-events-h', '@INPUT@', '@OUTPUT@' ])
- 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'),
@@ -47,17 +50,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.29.2
- [PATCH v3 0/8] [RfC] fix tracing for modules, Gerd Hoffmann, 2021/01/21
- [PATCH v3 1/8] meson: add trace_events_config[], Gerd Hoffmann, 2021/01/21
- [PATCH v3 5/8] trace: iter init tweaks, Gerd Hoffmann, 2021/01/21
- [PATCH v3 3/8] meson: add module_trace & module_trace_src,
Gerd Hoffmann <=
- [PATCH v3 4/8] meson: move qxl trace events to separate file, Gerd Hoffmann, 2021/01/21
- [PATCH v3 6/8] trace: add trace_event_iter_init_group, Gerd Hoffmann, 2021/01/21
- [PATCH v3 8/8] trace/simple: add st_init_group, Gerd Hoffmann, 2021/01/21
- [PATCH v3 2/8] meson: move up hw subdir (specifically before trace subdir), Gerd Hoffmann, 2021/01/21
- [PATCH v3 7/8] trace/simple: pass iter to st_write_event_mapping, Gerd Hoffmann, 2021/01/21