e32aaa5a19
On Fedora 36, with lttng-ust 2.13.1, compilation fails with:
In file included from trace/trace-ust-all.h:49085,
from trace/trace-ust-all.c:13:
/usr/include/lttng/tracepoint-event.h:67:10: error: #include expects "FILENAME" or <FILENAME>
67 | #include LTTNG_UST_TRACEPOINT_INCLUDE
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In lttng-ust commit 41858e2b6e8 ("Fix: don't do macro expansion in
tracepoint file name") from 2012, starting from lttng-ust 2.1, the API
was changed to expect TRACEPOINT_INCLUDE to be defined as a string.
In lttng-ust commit d2966b4b0b2 ("Remove TRACEPOINT_INCLUDE_FILE
macro"), in 2021, the compatibility macro was removed.
Use the "new" API from 2012, and bump the version requirement to 2.1 to
fix compilation with >= 2.13.
According to repology, all distributions we support have >= 2.1 (centos
8 has oldest with 2.8.1 afaict)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220328084717.367993-2-marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
106 lines
3.6 KiB
Python
106 lines
3.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
"""
|
|
trace/generated-ust-provider.h
|
|
"""
|
|
|
|
__author__ = "Mohamad Gebai <mohamad.gebai@polymtl.ca>"
|
|
__copyright__ = "Copyright 2012, Mohamad Gebai <mohamad.gebai@polymtl.ca>"
|
|
__license__ = "GPL version 2 or (at your option) any later version"
|
|
|
|
__maintainer__ = "Stefan Hajnoczi"
|
|
__email__ = "stefanha@redhat.com"
|
|
|
|
|
|
from tracetool import out
|
|
|
|
|
|
def generate(events, backend, group):
|
|
events = [e for e in events
|
|
if "disabled" not in e.properties]
|
|
|
|
if group == "all":
|
|
include = "trace-ust-all.h"
|
|
else:
|
|
include = "trace-ust.h"
|
|
|
|
out('/* This file is autogenerated by tracetool, do not edit. */',
|
|
'',
|
|
'#undef TRACEPOINT_PROVIDER',
|
|
'#define TRACEPOINT_PROVIDER qemu',
|
|
'',
|
|
'#undef TRACEPOINT_INCLUDE',
|
|
'#define TRACEPOINT_INCLUDE "./%s"' % include,
|
|
'',
|
|
'#if !defined (TRACE_%s_GENERATED_UST_H) || \\' % group.upper(),
|
|
' defined(TRACEPOINT_HEADER_MULTI_READ)',
|
|
'#define TRACE_%s_GENERATED_UST_H' % group.upper(),
|
|
'',
|
|
'#include <lttng/tracepoint.h>',
|
|
'',
|
|
'/*',
|
|
' * LTTng ust 2.0 does not allow you to use TP_ARGS(void) for tracepoints',
|
|
' * requiring no arguments. We define these macros introduced in more recent'
|
|
' * versions of LTTng ust as a workaround',
|
|
' */',
|
|
'#ifndef _TP_EXPROTO1',
|
|
'#define _TP_EXPROTO1(a) void',
|
|
'#endif',
|
|
'#ifndef _TP_EXDATA_PROTO1',
|
|
'#define _TP_EXDATA_PROTO1(a) void *__tp_data',
|
|
'#endif',
|
|
'#ifndef _TP_EXDATA_VAR1',
|
|
'#define _TP_EXDATA_VAR1(a) __tp_data',
|
|
'#endif',
|
|
'#ifndef _TP_EXVAR1',
|
|
'#define _TP_EXVAR1(a)',
|
|
'#endif',
|
|
'')
|
|
|
|
for e in events:
|
|
if len(e.args) > 0:
|
|
out('TRACEPOINT_EVENT(',
|
|
' qemu,',
|
|
' %(name)s,',
|
|
' TP_ARGS(%(args)s),',
|
|
' TP_FIELDS(',
|
|
name=e.name,
|
|
args=", ".join(", ".join(i) for i in e.args))
|
|
|
|
types = e.args.types()
|
|
names = e.args.names()
|
|
fmts = e.formats()
|
|
for t,n,f in zip(types, names, fmts):
|
|
if ('char *' in t) or ('char*' in t):
|
|
out(' ctf_string(' + n + ', ' + n + ')')
|
|
elif ("%p" in f) or ("x" in f) or ("PRIx" in f):
|
|
out(' ctf_integer_hex('+ t + ', ' + n + ', ' + n + ')')
|
|
elif ("ptr" in t) or ("*" in t):
|
|
out(' ctf_integer_hex('+ t + ', ' + n + ', ' + n + ')')
|
|
elif ('int' in t) or ('long' in t) or ('unsigned' in t) \
|
|
or ('size_t' in t) or ('bool' in t):
|
|
out(' ctf_integer(' + t + ', ' + n + ', ' + n + ')')
|
|
elif ('double' in t) or ('float' in t):
|
|
out(' ctf_float(' + t + ', ' + n + ', ' + n + ')')
|
|
elif ('void *' in t) or ('void*' in t):
|
|
out(' ctf_integer_hex(unsigned long, ' + n + ', ' + n + ')')
|
|
|
|
out(' )',
|
|
')',
|
|
'')
|
|
|
|
else:
|
|
out('TRACEPOINT_EVENT(',
|
|
' qemu,',
|
|
' %(name)s,',
|
|
' TP_ARGS(void),',
|
|
' TP_FIELDS()',
|
|
')',
|
|
'',
|
|
name=e.name)
|
|
|
|
out('#endif /* TRACE_%s_GENERATED_UST_H */' % group.upper(),
|
|
'',
|
|
'/* This part must be outside ifdef protection */',
|
|
'#include <lttng/tracepoint-event.h>')
|