Pull request
A build fix and a 'simple' trace backend regression fix. -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl8jDbYACgkQnKSrs4Gr c8gn2wgAlPr1Tf3BvIvXWb7PBKFkgY21Ctr5BhcheQrsDC4RwqFHAJbhzRjN3LyN E6i0mVe5cl9ufAtCNoMDQ293mbqfFVbz6gK9X+rwyY2iXPQ0Nvl5Z7IwLfB2WN/9 fvGtFbiiaJ/Vm52eOzEFmogAUqmdSzVl3xLer6zwXB08q2Owq/esH02pNSkainBT 3mGK8ePZH6+kigojR1FC0BTCs0QRoVRvXBIE90b8bjmzAGYUQbrTqXizDUAjJHd0 V8jcGJLFO2l0GQ9lSia04lkrosKVcmRW3TvkXtkDd754wtz9Wtqv+rwL5MVcwScs x50DKh27+/QyA8ByBFByPeIrtvlqVw== =pvlB -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging Pull request A build fix and a 'simple' trace backend regression fix. # gpg: Signature made Thu 30 Jul 2020 19:13:10 BST # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: tracetool: carefully define SDT_USE_VARIADIC trace/simple: Allow enabling simple traces from command line Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
1448629751
|
@ -44,11 +44,15 @@ def generate_h_begin(events, group):
|
|||
# require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h>
|
||||
# first without defining SDT_USE_VARIADIC then ust breaks because the
|
||||
# STAP_PROBEV() macro is not defined.
|
||||
out('#ifndef SDT_USE_VARIADIC')
|
||||
out('#define SDT_USE_VARIADIC 1')
|
||||
out('#endif')
|
||||
|
||||
out('#include "%s"' % header,
|
||||
'')
|
||||
|
||||
out('#undef SDT_USE_VARIADIC')
|
||||
|
||||
# SystemTap defines <provider>_<name>_ENABLED() but other DTrace
|
||||
# implementations might not.
|
||||
for e in events:
|
||||
|
|
|
@ -225,6 +225,7 @@ void trace_init_file(const char *file)
|
|||
{
|
||||
#ifdef CONFIG_TRACE_SIMPLE
|
||||
st_set_trace_file(file);
|
||||
st_set_trace_file_enabled(true);
|
||||
#elif defined CONFIG_TRACE_LOG
|
||||
/*
|
||||
* If both the simple and the log backends are enabled, "--trace file"
|
||||
|
|
Loading…
Reference in a new issue