From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Cleber Rosa <crosa@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 06/11] trace: add meson custom_target() depend_files for tracetool
Date: Mon, 1 Feb 2021 15:46:58 +0000 [thread overview]
Message-ID: <20210201154703.180022-7-stefanha@redhat.com> (raw)
In-Reply-To: <20210201154703.180022-1-stefanha@redhat.com>
Re-generate tracetool output when the tracetool source code changes. Use
the same approach as qapi_gen_depends and introduce a tracetool_depends
files list so meson is aware of the dependencies.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210125110958.214017-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
meson.build | 28 +++++++++++++++++++++++++++-
trace/meson.build | 21 ++++++++++++++-------
2 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index f00b7754fd..2d8b433ff0 100644
--- a/meson.build
+++ b/meson.build
@@ -1632,6 +1632,31 @@ tracetool = [
python, files('scripts/tracetool.py'),
'--backend=' + config_host['TRACE_BACKENDS']
]
+tracetool_depends = files(
+ 'scripts/tracetool/backend/log.py',
+ 'scripts/tracetool/backend/__init__.py',
+ 'scripts/tracetool/backend/dtrace.py',
+ 'scripts/tracetool/backend/ftrace.py',
+ 'scripts/tracetool/backend/simple.py',
+ 'scripts/tracetool/backend/syslog.py',
+ 'scripts/tracetool/backend/ust.py',
+ 'scripts/tracetool/format/tcg_h.py',
+ 'scripts/tracetool/format/ust_events_c.py',
+ 'scripts/tracetool/format/ust_events_h.py',
+ 'scripts/tracetool/format/__init__.py',
+ 'scripts/tracetool/format/d.py',
+ 'scripts/tracetool/format/tcg_helper_c.py',
+ 'scripts/tracetool/format/simpletrace_stap.py',
+ 'scripts/tracetool/format/c.py',
+ 'scripts/tracetool/format/h.py',
+ 'scripts/tracetool/format/tcg_helper_h.py',
+ 'scripts/tracetool/format/log_stap.py',
+ 'scripts/tracetool/format/stap.py',
+ 'scripts/tracetool/format/tcg_helper_wrapper_h.py',
+ 'scripts/tracetool/__init__.py',
+ 'scripts/tracetool/transform.py',
+ 'scripts/tracetool/vcpu.py'
+)
qemu_version_cmd = [find_program('scripts/qemu-version.sh'),
meson.current_source_dir(),
@@ -2219,7 +2244,8 @@ foreach target : target_dirs
'--target-type=' + target_type,
'--probe-prefix=qemu.' + target_type + '.' + target_name,
'@INPUT@', '@OUTPUT@'
- ])
+ ],
+ depend_files: tracetool_depends)
endforeach
endif
endforeach
diff --git a/trace/meson.build b/trace/meson.build
index a0be8f9b0d..08f83a15c3 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -12,17 +12,20 @@ foreach dir : [ '.' ] + trace_events_subdirs
trace_h = custom_target(fmt.format('trace', 'h'),
output: fmt.format('trace', 'h'),
input: trace_events_file,
- command: [ tracetool, group, '--format=h', '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, group, '--format=h', '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
genh += trace_h
trace_c = custom_target(fmt.format('trace', 'c'),
output: fmt.format('trace', 'c'),
input: trace_events_file,
- command: [ tracetool, group, '--format=c', '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, group, '--format=c', '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
if 'CONFIG_TRACE_UST' in config_host
trace_ust_h = custom_target(fmt.format('trace-ust', 'h'),
output: fmt.format('trace-ust', 'h'),
input: trace_events_file,
- command: [ tracetool, group, '--format=ust-events-h', '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, group, '--format=ust-events-h', '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
trace_ss.add(trace_ust_h, lttng, urcubp)
genh += trace_ust_h
endif
@@ -31,7 +34,8 @@ foreach dir : [ '.' ] + trace_events_subdirs
trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'),
output: fmt.format('trace-dtrace', 'dtrace'),
input: trace_events_file,
- command: [ tracetool, group, '--format=d', '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, group, '--format=d', '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
trace_dtrace_h = custom_target(fmt.format('trace-dtrace', 'h'),
output: fmt.format('trace-dtrace', 'h'),
input: trace_dtrace,
@@ -66,7 +70,8 @@ foreach d : [
gen = custom_target(d[0],
output: d[0],
input: meson.source_root() / 'trace-events',
- command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
specific_ss.add(when: 'CONFIG_TCG', if_true: gen)
endforeach
@@ -74,11 +79,13 @@ if 'CONFIG_TRACE_UST' in config_host
trace_ust_all_h = custom_target('trace-ust-all.h',
output: 'trace-ust-all.h',
input: trace_events_files,
- command: [ tracetool, '--group=all', '--format=ust-events-h', '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, '--group=all', '--format=ust-events-h', '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
trace_ust_all_c = custom_target('trace-ust-all.c',
output: 'trace-ust-all.c',
input: trace_events_files,
- command: [ tracetool, '--group=all', '--format=ust-events-c', '@INPUT@', '@OUTPUT@' ])
+ command: [ tracetool, '--group=all', '--format=ust-events-c', '@INPUT@', '@OUTPUT@' ],
+ depend_files: tracetool_depends)
trace_ss.add(trace_ust_all_h, trace_ust_all_c)
genh += trace_ust_all_h
endif
--
2.29.2
next prev parent reply other threads:[~2021-02-01 15:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 15:46 [PULL 00/11] Tracing patches Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 01/11] trace: fix simpletrace doc mismerge Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 02/11] tracing: convert documentation to rST Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 03/11] trace: recommend "log" backend for getting started with tracing Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 04/11] tracetool: fix "PRI" macro decoding Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 05/11] tracetool: also strip %l and %ll from systemtap format strings Stefan Hajnoczi
2021-02-01 15:46 ` Stefan Hajnoczi [this message]
2021-02-01 15:46 ` [PULL 07/11] error: rename error_with_timestamp to message_with_timestamp Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 08/11] trace: make the 'log' backend timestamp configurable Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 09/11] simpletrace: build() missing 2 required positional arguments Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 10/11] trace: document how to specify multiple --trace patterns Stefan Hajnoczi
2021-02-01 16:05 ` BALATON Zoltan
2021-02-01 16:13 ` Kevin Wolf
2021-02-01 16:27 ` Philippe Mathieu-Daudé
2021-02-01 16:29 ` BALATON Zoltan
2021-02-01 16:54 ` Kevin Wolf
2021-02-01 17:25 ` Paolo Bonzini
2021-02-01 17:39 ` BALATON Zoltan
2021-02-02 12:41 ` Markus Armbruster
2021-02-02 13:03 ` BALATON Zoltan
2021-02-02 13:12 ` Paolo Bonzini
2021-02-01 17:46 ` Daniel P. Berrangé
2021-02-01 18:13 ` BALATON Zoltan
2021-02-02 16:47 ` Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 11/11] trace: update docs with meson build information Stefan Hajnoczi
2021-02-02 11:24 ` [PULL 00/11] Tracing patches Peter Maydell
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=20210201154703.180022-7-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).