From 3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 6 May 2020 09:45:16 -0400 Subject: [PATCH] Cleanup: Move headers from probes/ to include/lttng/ - Remove extra "lttng-" from filename (now implied by the path). - Adapt includes accordingly. - Adapt lttng-syscalls-generate-headers.sh header generation script accordingly. - Remove probes/lttng.h, include its PARAMS() define in the two user headers. Signed-off-by: Mathieu Desnoyers --- {probes => include/lttng}/define_trace.h | 4 +- .../lttng/events-nowrite.h | 2 +- .../lttng/events-reset.h | 2 +- .../lttng/events-write.h | 2 +- .../lttng/probe-user.h | 2 +- .../lttng/tracepoint-event-impl.h | 48 ++++++++++--------- .../lttng/tracepoint-event.h | 2 +- probes/lttng-types.h => include/lttng/types.h | 6 ++- instrumentation/events/lttng-module/9p.h | 4 +- .../events/lttng-module/arch/x86/exceptions.h | 4 +- .../lttng-module/arch/x86/irq_vectors.h | 4 +- .../lttng-module/arch/x86/kvm/mmutrace.h | 4 +- .../events/lttng-module/arch/x86/kvm/trace.h | 4 +- instrumentation/events/lttng-module/asoc.h | 4 +- instrumentation/events/lttng-module/block.h | 4 +- instrumentation/events/lttng-module/btrfs.h | 4 +- .../events/lttng-module/compaction.h | 4 +- instrumentation/events/lttng-module/ext3.h | 4 +- instrumentation/events/lttng-module/ext4.h | 4 +- instrumentation/events/lttng-module/gpio.h | 4 +- instrumentation/events/lttng-module/i2c.h | 4 +- instrumentation/events/lttng-module/irq.h | 4 +- instrumentation/events/lttng-module/jbd.h | 4 +- instrumentation/events/lttng-module/jbd2.h | 4 +- instrumentation/events/lttng-module/kmem.h | 4 +- instrumentation/events/lttng-module/kvm.h | 4 +- instrumentation/events/lttng-module/lock.h | 4 +- .../events/lttng-module/lttng-statedump.h | 4 +- .../events/lttng-module/lttng-test.h | 4 +- instrumentation/events/lttng-module/lttng.h | 4 +- .../events/lttng-module/mm_vmscan.h | 4 +- instrumentation/events/lttng-module/module.h | 4 +- instrumentation/events/lttng-module/napi.h | 4 +- instrumentation/events/lttng-module/net.h | 4 +- instrumentation/events/lttng-module/power.h | 4 +- .../events/lttng-module/preemptirq.h | 4 +- instrumentation/events/lttng-module/printk.h | 4 +- instrumentation/events/lttng-module/random.h | 4 +- instrumentation/events/lttng-module/rcu.h | 4 +- instrumentation/events/lttng-module/regmap.h | 4 +- .../events/lttng-module/regulator.h | 4 +- instrumentation/events/lttng-module/rpc.h | 4 +- instrumentation/events/lttng-module/rpm.h | 4 +- instrumentation/events/lttng-module/sched.h | 4 +- instrumentation/events/lttng-module/scsi.h | 4 +- instrumentation/events/lttng-module/signal.h | 4 +- instrumentation/events/lttng-module/skb.h | 4 +- instrumentation/events/lttng-module/sock.h | 4 +- instrumentation/events/lttng-module/timer.h | 4 +- instrumentation/events/lttng-module/udp.h | 4 +- instrumentation/events/lttng-module/v4l2.h | 4 +- .../events/lttng-module/workqueue.h | 4 +- .../events/lttng-module/writeback.h | 4 +- .../headers/arm-32-syscalls_integers.h | 4 +- .../headers/arm-32-syscalls_pointers.h | 4 +- .../headers/arm-64-syscalls_integers.h | 4 +- .../headers/arm-64-syscalls_pointers.h | 4 +- .../headers/mips-32-syscalls_integers.h | 4 +- .../headers/mips-32-syscalls_pointers.h | 4 +- .../headers/mips-64-syscalls_integers.h | 4 +- .../headers/mips-64-syscalls_pointers.h | 4 +- .../headers/powerpc-32-syscalls_integers.h | 4 +- .../headers/powerpc-32-syscalls_pointers.h | 4 +- .../syscalls/headers/syscalls_unknown.h | 4 +- .../headers/x86-32-syscalls_integers.h | 4 +- .../headers/x86-32-syscalls_pointers.h | 4 +- .../headers/x86-64-syscalls_integers.h | 4 +- .../headers/x86-64-syscalls_pointers.h | 4 +- .../lttng-syscalls-generate-headers.sh | 4 +- probes/lttng-probe-user.c | 2 +- probes/lttng.h | 14 ------ 71 files changed, 159 insertions(+), 169 deletions(-) rename {probes => include/lttng}/define_trace.h (98%) rename probes/lttng-events-nowrite.h => include/lttng/events-nowrite.h (99%) rename probes/lttng-events-reset.h => include/lttng/events-reset.h (99%) rename probes/lttng-events-write.h => include/lttng/events-write.h (99%) rename probes/lttng-probe-user.h => include/lttng/probe-user.h (94%) rename probes/lttng-tracepoint-event-impl.h => include/lttng/tracepoint-event-impl.h (97%) rename probes/lttng-tracepoint-event.h => include/lttng/tracepoint-event.h (98%) rename probes/lttng-types.h => include/lttng/types.h (96%) delete mode 100644 probes/lttng.h diff --git a/probes/define_trace.h b/include/lttng/define_trace.h similarity index 98% rename from probes/define_trace.h rename to include/lttng/define_trace.h index f8f9d342..b0a5cb67 100644 --- a/probes/define_trace.h +++ b/include/lttng/define_trace.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * define_trace.h + * lttng/define_trace.h * * Copyright (C) 2009 Steven Rostedt * Copyright (C) 2010-2012 Mathieu Desnoyers @@ -84,7 +84,7 @@ #define DECLARE_TRACE(name, proto, args) #ifdef LTTNG_PACKAGE_BUILD -#include +#include #endif #undef LTTNG_TRACEPOINT_EVENT diff --git a/probes/lttng-events-nowrite.h b/include/lttng/events-nowrite.h similarity index 99% rename from probes/lttng-events-nowrite.h rename to include/lttng/events-nowrite.h index 5f6b64c7..5d70b888 100644 --- a/probes/lttng-events-nowrite.h +++ b/include/lttng/events-nowrite.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-events-write.h + * lttng/events-write.h * * Copyright (C) 2014 Mathieu Desnoyers */ diff --git a/probes/lttng-events-reset.h b/include/lttng/events-reset.h similarity index 99% rename from probes/lttng-events-reset.h rename to include/lttng/events-reset.h index 91ddab48..64e76471 100644 --- a/probes/lttng-events-reset.h +++ b/include/lttng/events-reset.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-events-reset.h + * lttng/events-reset.h * * Copyright (C) 2010-2012 Mathieu Desnoyers */ diff --git a/probes/lttng-events-write.h b/include/lttng/events-write.h similarity index 99% rename from probes/lttng-events-write.h rename to include/lttng/events-write.h index c0732a54..646977a1 100644 --- a/probes/lttng-events-write.h +++ b/include/lttng/events-write.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-events-write.h + * lttng/events-write.h * * Copyright (C) 2014 Mathieu Desnoyers */ diff --git a/probes/lttng-probe-user.h b/include/lttng/probe-user.h similarity index 94% rename from probes/lttng-probe-user.h rename to include/lttng/probe-user.h index d85bb6f7..6b7f38dc 100644 --- a/probes/lttng-probe-user.h +++ b/include/lttng/probe-user.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-probe-user.h + * lttng/probe-user.h * * Copyright (C) 2012 Mathieu Desnoyers */ diff --git a/probes/lttng-tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h similarity index 97% rename from probes/lttng-tracepoint-event-impl.h rename to include/lttng/tracepoint-event-impl.h index 5dee7fbe..25077772 100644 --- a/probes/lttng-tracepoint-event-impl.h +++ b/include/lttng/tracepoint-event-impl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-tracepoint-event-impl.h + * lttng/tracepoint-event-impl.h * * Copyright (C) 2009 Steven Rostedt * Copyright (C) 2009-2014 Mathieu Desnoyers @@ -12,9 +12,8 @@ #include #include -#include -#include -#include +#include +#include #include /* for wrapper_vmalloc_sync_mappings() */ #include #include @@ -26,6 +25,9 @@ #define __LTTNG_NULL_STRING "(null)" +#undef PARAMS +#define PARAMS(args...) args + /* * Macro declarations used for all stages. */ @@ -118,7 +120,7 @@ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include +#include #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ @@ -144,7 +146,7 @@ void trace_##_name(void); * class and the instance using the class actually match. */ -#include /* Reset all macros within TRACE_EVENT */ +#include /* Reset all macros within TRACE_EVENT */ #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ @@ -175,7 +177,7 @@ void __event_template_proto___##_name(void); * * Unfolding the enums */ -#include /* Reset all macros within TRACE_EVENT */ +#include /* Reset all macros within TRACE_EVENT */ /* Enumeration entry (single value) */ #undef ctf_enum_value @@ -249,9 +251,9 @@ void __event_template_proto___##_name(void); */ /* Reset all macros within TRACEPOINT_EVENT */ -#include -#include -#include +#include +#include +#include #undef _ctf_integer_ext #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ @@ -452,7 +454,7 @@ void __event_template_proto___##_name(void); */ /* Reset all macros within TRACEPOINT_EVENT */ -#include +#include #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ @@ -474,8 +476,8 @@ static void __event_probe__##_name(void *__data); */ /* Reset all macros within TRACEPOINT_EVENT */ -#include -#include +#include +#include #undef _ctf_integer_ext #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ @@ -600,9 +602,9 @@ error: \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include -#include -#include +#include +#include +#include #undef _ctf_integer_ext_fetched #define _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ @@ -791,8 +793,8 @@ void __event_prepare_filter_stack__##_name(char *__stack_data, \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include -#include +#include +#include #undef _ctf_integer_ext #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ @@ -880,8 +882,8 @@ static inline size_t __event_get_align__##_name(void *__tp_locvar) \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include -#include +#include +#include #undef _ctf_integer_ext_fetched #define _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ @@ -1325,7 +1327,7 @@ __post: \ /* Named field types must be defined in lttng-types.h */ -#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ +#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #ifndef TP_PROBE_CB #define TP_PROBE_CB(_template) &__event_probe__##_template @@ -1354,7 +1356,7 @@ static const struct lttng_event_desc __event_desc___##_map = { \ * Create an array of event description pointers. */ -#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ +#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS #define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \ @@ -1402,7 +1404,7 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { * Register/unregister probes at module load/unload. */ -#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ +#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #define TP_ID1(_token, _system) _token##_system #define TP_ID(_token, _system) TP_ID1(_token, _system) diff --git a/probes/lttng-tracepoint-event.h b/include/lttng/tracepoint-event.h similarity index 98% rename from probes/lttng-tracepoint-event.h rename to include/lttng/tracepoint-event.h index 1a66245e..d3ad1b32 100644 --- a/probes/lttng-tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-tracepoint-event.h + * lttng/tracepoint-event.h * * Copyright (C) 2014 Mathieu Desnoyers */ diff --git a/probes/lttng-types.h b/include/lttng/types.h similarity index 96% rename from probes/lttng-types.h rename to include/lttng/types.h index f6b4785f..fa09dce3 100644 --- a/probes/lttng-types.h +++ b/include/lttng/types.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * probes/lttng-types.h + * lttng/types.h * * LTTng types. * @@ -15,13 +15,15 @@ #define _LTTNG_PROBES_LTTNG_TYPES_H #include -#include #include #include #include #endif /* _LTTNG_PROBES_LTTNG_TYPES_H */ +#undef PARAMS +#define PARAMS(args...) args + /* Export enumerations */ #ifdef STAGE_EXPORT_ENUMS diff --git a/instrumentation/events/lttng-module/9p.h b/instrumentation/events/lttng-module/9p.h index 509b984f..0123bbfc 100644 --- a/instrumentation/events/lttng-module/9p.h +++ b/instrumentation/events/lttng-module/9p.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_9P_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_9P_H -#include +#include #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) @@ -54,4 +54,4 @@ LTTNG_TRACEPOINT_EVENT(9p_protocol_dump, #endif /* LTTNG_TRACE_9P_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/arch/x86/exceptions.h b/instrumentation/events/lttng-module/arch/x86/exceptions.h index ec34d35b..eb55138a 100644 --- a/instrumentation/events/lttng-module/arch/x86/exceptions.h +++ b/instrumentation/events/lttng-module/arch/x86/exceptions.h @@ -2,7 +2,7 @@ #if !defined(LTTNG_TRACE_EXCEPTIONS_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_EXCEPTIONS_H -#include +#include #include #undef TRACE_SYSTEM @@ -50,4 +50,4 @@ LTTNG_EXCEPTIONS_TRACEPOINT_EVENT_INSTANCE_MAP(page_fault_kernel, #define TRACE_INCLUDE_FILE exceptions /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h index aa0d6d71..ff0f45b8 100644 --- a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h +++ b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h @@ -2,7 +2,7 @@ #if !defined(LTTNG_TRACE_IRQ_VECTORS_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_IRQ_VECTORS_H -#include +#include #include #undef TRACE_SYSTEM @@ -113,4 +113,4 @@ LTTNG_IRQ_VECTOR_TRACEPOINT_EVENT_INSTANCE_MAP(thermal_apic, #define TRACE_INCLUDE_FILE irq_vectors /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index 3ccae187..1195ded7 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -2,7 +2,7 @@ #if !defined(LTTNG_TRACE_KVM_MMU_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_KVM_MMU_H -#include +#include #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) @@ -271,4 +271,4 @@ LTTNG_TRACEPOINT_EVENT_MAP( #define TRACE_INCLUDE_FILE mmutrace /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h index 0969d32a..1b3b9ebc 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h @@ -2,7 +2,7 @@ #if !defined(LTTNG_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_KVM_H -#include +#include #include #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) @@ -537,4 +537,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_track_tsc, kvm_x86_track_tsc, #define TRACE_INCLUDE_FILE trace /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h index eed81cdf..7d86af87 100644 --- a/instrumentation/events/lttng-module/asoc.h +++ b/instrumentation/events/lttng-module/asoc.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_ASOC_H -#include +#include #include #include @@ -411,4 +411,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync, #endif /* LTTNG_TRACE_ASOC_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index d98febe2..3b087d66 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_BLOCK_H -#include +#include #include #include #include @@ -1051,4 +1051,4 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap, #endif /* LTTNG_TRACE_BLOCK_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h index 46cb29b8..f38444bf 100644 --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_BTRFS_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_BTRFS_H -#include +#include #include #include @@ -2382,4 +2382,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state, #endif /* LTTNG_TRACE_BTRFS_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h index 6d8e4dd9..72925c14 100644 --- a/instrumentation/events/lttng-module/compaction.h +++ b/instrumentation/events/lttng-module/compaction.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_COMPACTION_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_COMPACTION_H -#include +#include #include #include @@ -155,4 +155,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, #endif /* LTTNG_TRACE_COMPACTION_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/ext3.h b/instrumentation/events/lttng-module/ext3.h index e40f4888..8852a1ee 100644 --- a/instrumentation/events/lttng-module/ext3.h +++ b/instrumentation/events/lttng-module/ext3.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_EXT3_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_EXT3_H -#include +#include #include LTTNG_TRACEPOINT_EVENT(ext3_free_inode, @@ -519,4 +519,4 @@ LTTNG_TRACEPOINT_EVENT(ext3_load_inode, #endif /* LTTNG_TRACE_EXT3_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h index 9918bcbc..e57aff8b 100644 --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_EXT4_H -#include +#include #include #include @@ -1868,4 +1868,4 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, #endif /* LTTNG_TRACE_EXT4_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/gpio.h b/instrumentation/events/lttng-module/gpio.h index 7a9246e7..97e5e847 100644 --- a/instrumentation/events/lttng-module/gpio.h +++ b/instrumentation/events/lttng-module/gpio.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_GPIO_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_GPIO_H -#include +#include LTTNG_TRACEPOINT_EVENT(gpio_direction, @@ -36,4 +36,4 @@ LTTNG_TRACEPOINT_EVENT(gpio_value, #endif /* if !defined(LTTNG_TRACE_GPIO_H) || defined(TRACE_HEADER_MULTI_READ) */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/i2c.h b/instrumentation/events/lttng-module/i2c.h index 7fad2f7d..312f6733 100644 --- a/instrumentation/events/lttng-module/i2c.h +++ b/instrumentation/events/lttng-module/i2c.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_I2C_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_I2C_H -#include +#include /* * __i2c_transfer() write request @@ -117,4 +117,4 @@ LTTNG_TRACEPOINT_EVENT(i2c_result, #endif /* LTTNG_TRACE_I2C_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/irq.h b/instrumentation/events/lttng-module/irq.h index e1bbbafe..a66b8139 100644 --- a/instrumentation/events/lttng-module/irq.h +++ b/instrumentation/events/lttng-module/irq.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_IRQ_H -#include +#include #ifndef _TRACE_IRQ_DEF_ #define _TRACE_IRQ_DEF_ @@ -123,4 +123,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise, #endif /* LTTNG_TRACE_IRQ_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h index 1195fea2..e9aabd69 100644 --- a/instrumentation/events/lttng-module/jbd.h +++ b/instrumentation/events/lttng-module/jbd.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_JBD_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_JBD_H -#include +#include #include #include @@ -154,4 +154,4 @@ LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end, #endif /* LTTNG_TRACE_JBD_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/jbd2.h b/instrumentation/events/lttng-module/jbd2.h index 3c5d3da0..04968735 100644 --- a/instrumentation/events/lttng-module/jbd2.h +++ b/instrumentation/events/lttng-module/jbd2.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_JBD2_H -#include +#include #include #include @@ -174,4 +174,4 @@ LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock, #endif /* LTTNG_TRACE_JBD2_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index 1b175ddb..8f56cc5a 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_KMEM_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_KMEM_H -#include +#include #include #include @@ -335,4 +335,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, #endif /* LTTNG_TRACE_KMEM_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h index 894bf6a2..b05482ee 100644 --- a/instrumentation/events/lttng-module/kvm.h +++ b/instrumentation/events/lttng-module/kvm.h @@ -2,7 +2,7 @@ #if !defined(LTTNG_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_KVM_MAIN_H -#include +#include #include #undef TRACE_SYSTEM @@ -271,4 +271,4 @@ LTTNG_TRACEPOINT_EVENT( #endif /* LTTNG_TRACE_KVM_MAIN_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/lock.h b/instrumentation/events/lttng-module/lock.h index f384fd4a..af28517e 100644 --- a/instrumentation/events/lttng-module/lock.h +++ b/instrumentation/events/lttng-module/lock.h @@ -7,7 +7,7 @@ #define LTTNG_TRACE_LOCK_H #include -#include +#include #ifdef CONFIG_LOCKDEP @@ -68,4 +68,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_acquired, #endif /* LTTNG_TRACE_LOCK_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h index f8f10e7c..23fdd0e8 100644 --- a/instrumentation/events/lttng-module/lttng-statedump.h +++ b/instrumentation/events/lttng-module/lttng-statedump.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_LTTNG_STATEDUMP_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_LTTNG_STATEDUMP_H -#include +#include #include #include #include @@ -268,4 +268,4 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology, #endif /* LTTNG_TRACE_LTTNG_STATEDUMP_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/lttng-test.h b/instrumentation/events/lttng-module/lttng-test.h index f9fb5a84..7d2b1f7c 100644 --- a/instrumentation/events/lttng-module/lttng-test.h +++ b/instrumentation/events/lttng-module/lttng-test.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_LTTNG_TEST_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_LTTNG_TEST_H -#include +#include #include #include @@ -55,4 +55,4 @@ LTTNG_TRACEPOINT_EVENT(lttng_test_filter_event, #endif /* LTTNG_TRACE_LTTNG_TEST_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/lttng.h b/instrumentation/events/lttng-module/lttng.h index 376fd537..91eb4608 100644 --- a/instrumentation/events/lttng-module/lttng.h +++ b/instrumentation/events/lttng-module/lttng.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_LTTNG_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_LTTNG_H -#include +#include LTTNG_TRACEPOINT_EVENT(lttng_logger, TP_PROTO(const char __user *text, size_t len), @@ -18,4 +18,4 @@ LTTNG_TRACEPOINT_EVENT(lttng_logger, #endif /* LTTNG_TRACE_LTTNG_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/mm_vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h index a02b24de..8bdd65d2 100644 --- a/instrumentation/events/lttng-module/mm_vmscan.h +++ b/instrumentation/events/lttng-module/mm_vmscan.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_MM_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_MM_VMSCAN_H -#include +#include #include #include #include @@ -822,4 +822,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(update_swap_token_priority, #endif /* LTTNG_TRACE_MM_VMSCAN_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h index 1dae9ad1..5831650b 100644 --- a/instrumentation/events/lttng-module/module.h +++ b/instrumentation/events/lttng-module/module.h @@ -15,7 +15,7 @@ #if !defined(LTTNG_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_MODULE_H -#include +#include #include #ifdef CONFIG_MODULES @@ -102,4 +102,4 @@ LTTNG_TRACEPOINT_EVENT(module_request, #endif /* LTTNG_TRACE_MODULE_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h index 8509f7d1..8a32993f 100644 --- a/instrumentation/events/lttng-module/napi.h +++ b/instrumentation/events/lttng-module/napi.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_NAPI_H -#include +#include #include #include @@ -48,4 +48,4 @@ LTTNG_TRACEPOINT_EVENT(napi_poll, #endif /* LTTNG_TRACE_NAPI_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h index 55aba4e0..e42fb2ec 100644 --- a/instrumentation/events/lttng-module/net.h +++ b/instrumentation/events/lttng-module/net.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_NET_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_NET_H -#include +#include #include #include #include @@ -868,4 +868,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, #endif /* LTTNG_TRACE_NET_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/power.h b/instrumentation/events/lttng-module/power.h index 1f6c6e8a..dd03d60a 100644 --- a/instrumentation/events/lttng-module/power.h +++ b/instrumentation/events/lttng-module/power.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_POWER_H -#include +#include #include #include @@ -239,4 +239,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(power_domain, power_domain_target, #endif /* LTTNG_TRACE_POWER_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/preemptirq.h b/instrumentation/events/lttng-module/preemptirq.h index d34f8d6b..36aa36cb 100644 --- a/instrumentation/events/lttng-module/preemptirq.h +++ b/instrumentation/events/lttng-module/preemptirq.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include /* * The preemptirq probe is built when CONFIG_PREEMPTIRQ_EVENTS is defined. @@ -95,6 +95,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(preemptirq_template, preempt_enable, #endif /* LTTNG_TRACE_PREEMPTIRQ_H */ /* This part must be outside protection */ -#include +#include #endif /* CONFIG_PREEMPTIRQ_EVENTS */ diff --git a/instrumentation/events/lttng-module/printk.h b/instrumentation/events/lttng-module/printk.h index 444f299b..75b4ee92 100644 --- a/instrumentation/events/lttng-module/printk.h +++ b/instrumentation/events/lttng-module/printk.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_PRINTK_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_PRINTK_H -#include +#include #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)) @@ -73,4 +73,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(console, #endif /* LTTNG_TRACE_PRINTK_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h index 621d5e72..7cf0908f 100644 --- a/instrumentation/events/lttng-module/random.h +++ b/instrumentation/events/lttng-module/random.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_RANDOM_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_RANDOM_H -#include +#include #include LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes, @@ -129,4 +129,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy_use #endif /* LTTNG_TRACE_RANDOM_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/rcu.h b/instrumentation/events/lttng-module/rcu.h index 73b2262c..9c7a6de1 100644 --- a/instrumentation/events/lttng-module/rcu.h +++ b/instrumentation/events/lttng-module/rcu.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_RCU_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_RCU_H -#include +#include #include /* @@ -961,4 +961,4 @@ LTTNG_TRACEPOINT_EVENT(rcu_barrier, #endif /* LTTNG_TRACE_RCU_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/regmap.h b/instrumentation/events/lttng-module/regmap.h index f8644816..8af4d5ae 100644 --- a/instrumentation/events/lttng-module/regmap.h +++ b/instrumentation/events/lttng-module/regmap.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_REGMAP_H -#include +#include #include #include @@ -142,4 +142,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_bool, regmap_cache_bypass, #endif /* LTTNG_TRACE_REGMAP_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/regulator.h b/instrumentation/events/lttng-module/regulator.h index 46ad50d2..bfdb6b65 100644 --- a/instrumentation/events/lttng-module/regulator.h +++ b/instrumentation/events/lttng-module/regulator.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_REGULATOR_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_REGULATOR_H -#include +#include #include /* @@ -115,4 +115,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_value, regulator_set_voltage_complete, #endif /* _TRACE_POWER_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h index c3c62ed1..90499aee 100644 --- a/instrumentation/events/lttng-module/rpc.h +++ b/instrumentation/events/lttng-module/rpc.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_RPC_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_RPC_H -#include +#include #include #include @@ -363,4 +363,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup, #endif /* LTTNG_TRACE_RPC_H */ -#include +#include diff --git a/instrumentation/events/lttng-module/rpm.h b/instrumentation/events/lttng-module/rpm.h index 7aa44d79..1e425f8e 100644 --- a/instrumentation/events/lttng-module/rpm.h +++ b/instrumentation/events/lttng-module/rpm.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_RUNTIME_POWER_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_RUNTIME_POWER_H -#include +#include #include #ifndef _TRACE_RPM_DEF_ @@ -70,4 +70,4 @@ LTTNG_TRACEPOINT_EVENT(rpm_return_int, #endif /* LTTNG_TRACE_RUNTIME_POWER_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h index 80f85ca4..10da76c9 100644 --- a/instrumentation/events/lttng-module/sched.h +++ b/instrumentation/events/lttng-module/sched.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_SCHED_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SCHED_H -#include +#include #include #include #include @@ -627,4 +627,4 @@ LTTNG_TRACEPOINT_EVENT(sched_pi_setprio, #endif /* LTTNG_TRACE_SCHED_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/scsi.h b/instrumentation/events/lttng-module/scsi.h index 2f26ccb8..21637bc1 100644 --- a/instrumentation/events/lttng-module/scsi.h +++ b/instrumentation/events/lttng-module/scsi.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_SCSI_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SCSI_H -#include +#include #include #include #include @@ -487,4 +487,4 @@ LTTNG_TRACEPOINT_EVENT(scsi_eh_wakeup, #endif /* LTTNG_TRACE_SCSI_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h index 2b1fac82..4a71d14b 100644 --- a/instrumentation/events/lttng-module/signal.h +++ b/instrumentation/events/lttng-module/signal.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SIGNAL_H -#include +#include #include #ifndef _TRACE_SIGNAL_DEF @@ -199,4 +199,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_lose_info, #endif /* LTTNG_TRACE_SIGNAL_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h index a9396f45..2be9d83f 100644 --- a/instrumentation/events/lttng-module/skb.h +++ b/instrumentation/events/lttng-module/skb.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SKB_H -#include +#include #include #include #include @@ -56,4 +56,4 @@ LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec, #endif /* LTTNG_TRACE_SKB_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h index dd34bb81..955bc1a3 100644 --- a/instrumentation/events/lttng-module/sock.h +++ b/instrumentation/events/lttng-module/sock.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_SOCK_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SOCK_H -#include +#include #include #include @@ -82,4 +82,4 @@ LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit, #endif /* LTTNG_TRACE_SOCK_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h index 881553c5..503c5bc2 100644 --- a/instrumentation/events/lttng-module/timer.h +++ b/instrumentation/events/lttng-module/timer.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_TIMER_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_TIMER_H -#include +#include #ifndef _TRACE_TIMER_DEF_ #define _TRACE_TIMER_DEF_ @@ -394,4 +394,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire, #endif /* LTTNG_TRACE_TIMER_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/udp.h b/instrumentation/events/lttng-module/udp.h index 427fa006..b63a1bb5 100644 --- a/instrumentation/events/lttng-module/udp.h +++ b/instrumentation/events/lttng-module/udp.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_UDP_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_UDP_H -#include +#include #include LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb, @@ -23,4 +23,4 @@ LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb, #endif /* LTTNG_TRACE_UDP_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/v4l2.h b/instrumentation/events/lttng-module/v4l2.h index de7e5060..dd7551e8 100644 --- a/instrumentation/events/lttng-module/v4l2.h +++ b/instrumentation/events/lttng-module/v4l2.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_V4L2_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_V4L2_H -#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) LTTNG_TRACEPOINT_EVENT_CLASS(v4l2_class, @@ -79,4 +79,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(v4l2_class, #endif /* if !defined(LTTNG_TRACE_V4L2_H) || defined(TRACE_HEADER_MULTI_READ) */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/workqueue.h b/instrumentation/events/lttng-module/workqueue.h index 138757bd..8ca0d6bf 100644 --- a/instrumentation/events/lttng-module/workqueue.h +++ b/instrumentation/events/lttng-module/workqueue.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_WORKQUEUE_H -#include +#include #include #include @@ -129,4 +129,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end, #endif /* LTTNG_TRACE_WORKQUEUE_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h index 68d27d34..fd898c51 100644 --- a/instrumentation/events/lttng-module/writeback.h +++ b/instrumentation/events/lttng-module/writeback.h @@ -5,7 +5,7 @@ #if !defined(LTTNG_TRACE_WRITEBACK_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_WRITEBACK_H -#include +#include #include #include #include @@ -729,4 +729,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_single_inode_template, writeback_singl #endif /* LTTNG_TRACE_WRITEBACK_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/syscalls/headers/arm-32-syscalls_integers.h b/instrumentation/syscalls/headers/arm-32-syscalls_integers.h index 5d0e8709..74fb4d8a 100644 --- a/instrumentation/syscalls/headers/arm-32-syscalls_integers.h +++ b/instrumentation/syscalls/headers/arm-32-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "arm-32-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -826,7 +826,7 @@ SC_LTTNG_TRACEPOINT_EVENT(keyctl, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h b/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h index 094fa2ec..a5d18380 100644 --- a/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "arm-32-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1355,7 +1355,7 @@ SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/arm-64-syscalls_integers.h b/instrumentation/syscalls/headers/arm-64-syscalls_integers.h index 57d2c66b..e9c15a9c 100644 --- a/instrumentation/syscalls/headers/arm-64-syscalls_integers.h +++ b/instrumentation/syscalls/headers/arm-64-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "arm-64-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -693,7 +693,7 @@ SC_LTTNG_TRACEPOINT_EVENT(remap_file_pages, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/arm-64-syscalls_pointers.h b/instrumentation/syscalls/headers/arm-64-syscalls_pointers.h index f7ae855f..d6d301cc 100644 --- a/instrumentation/syscalls/headers/arm-64-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/arm-64-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "arm-64-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1166,7 +1166,7 @@ SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/mips-32-syscalls_integers.h b/instrumentation/syscalls/headers/mips-32-syscalls_integers.h index 69338a12..1daea752 100644 --- a/instrumentation/syscalls/headers/mips-32-syscalls_integers.h +++ b/instrumentation/syscalls/headers/mips-32-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "mips-32-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -758,7 +758,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mips_mmap2, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/mips-32-syscalls_pointers.h b/instrumentation/syscalls/headers/mips-32-syscalls_pointers.h index d638087b..3ff5ad7f 100644 --- a/instrumentation/syscalls/headers/mips-32-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/mips-32-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "mips-32-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1327,7 +1327,7 @@ SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/mips-64-syscalls_integers.h b/instrumentation/syscalls/headers/mips-64-syscalls_integers.h index 302a788d..855087f6 100644 --- a/instrumentation/syscalls/headers/mips-64-syscalls_integers.h +++ b/instrumentation/syscalls/headers/mips-64-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "mips-64-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -796,7 +796,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mips_mmap, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/mips-64-syscalls_pointers.h b/instrumentation/syscalls/headers/mips-64-syscalls_pointers.h index 8bcf9b00..203da38e 100644 --- a/instrumentation/syscalls/headers/mips-64-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/mips-64-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "mips-64-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1306,7 +1306,7 @@ SC_LTTNG_TRACEPOINT_EVENT(splice, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls_integers.h b/instrumentation/syscalls/headers/powerpc-32-syscalls_integers.h index a4ee13e9..2c8f40de 100644 --- a/instrumentation/syscalls/headers/powerpc-32-syscalls_integers.h +++ b/instrumentation/syscalls/headers/powerpc-32-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "powerpc-32-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -726,7 +726,7 @@ SC_LTTNG_TRACEPOINT_EVENT(keyctl, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls_pointers.h b/instrumentation/syscalls/headers/powerpc-32-syscalls_pointers.h index 73a28a79..d9cde3a8 100644 --- a/instrumentation/syscalls/headers/powerpc-32-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/powerpc-32-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "powerpc-32-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1355,7 +1355,7 @@ SC_LTTNG_TRACEPOINT_EVENT(recvfrom, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/syscalls_unknown.h b/instrumentation/syscalls/headers/syscalls_unknown.h index 1718f5c0..79939c80 100644 --- a/instrumentation/syscalls/headers/syscalls_unknown.h +++ b/instrumentation/syscalls/headers/syscalls_unknown.h @@ -3,7 +3,7 @@ #if !defined(_TRACE_SYSCALLS_UNKNOWN_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_UNKNOWN_H -#include +#include #include #define UNKNOWN_SYSCALL_NRARGS 6 @@ -52,4 +52,4 @@ LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_unknown, #endif /* _TRACE_SYSCALLS_UNKNOWN_H */ /* This part must be outside protection */ -#include +#include diff --git a/instrumentation/syscalls/headers/x86-32-syscalls_integers.h b/instrumentation/syscalls/headers/x86-32-syscalls_integers.h index 6e1fc8ec..ddc8b21e 100644 --- a/instrumentation/syscalls/headers/x86-32-syscalls_integers.h +++ b/instrumentation/syscalls/headers/x86-32-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "x86-32-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -822,7 +822,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap_pgoff, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/x86-32-syscalls_pointers.h b/instrumentation/syscalls/headers/x86-32-syscalls_pointers.h index da15bfd1..40ad713e 100644 --- a/instrumentation/syscalls/headers/x86-32-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/x86-32-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "x86-32-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1306,7 +1306,7 @@ SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/x86-64-syscalls_integers.h b/instrumentation/syscalls/headers/x86-64-syscalls_integers.h index c2963921..d752c907 100644 --- a/instrumentation/syscalls/headers/x86-64-syscalls_integers.h +++ b/instrumentation/syscalls/headers/x86-64-syscalls_integers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_INTEGERS_H -#include +#include #include #include "x86-64-syscalls_integers_override.h" #include "syscalls_integers_override.h" @@ -751,7 +751,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap, #endif /* _TRACE_SYSCALLS_INTEGERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/headers/x86-64-syscalls_pointers.h b/instrumentation/syscalls/headers/x86-64-syscalls_pointers.h index 0d084882..f04b33ad 100644 --- a/instrumentation/syscalls/headers/x86-64-syscalls_pointers.h +++ b/instrumentation/syscalls/headers/x86-64-syscalls_pointers.h @@ -9,7 +9,7 @@ #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_POINTERS_H -#include +#include #include #include "x86-64-syscalls_pointers_override.h" #include "syscalls_pointers_override.h" @@ -1348,7 +1348,7 @@ SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev, #endif /* _TRACE_SYSCALLS_POINTERS_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh index 863f390e..df29abf7 100755 --- a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh +++ b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh @@ -81,7 +81,7 @@ echo "/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ #if !defined(_TRACE_SYSCALLS_${CLASSCAP}_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_${CLASSCAP}_H -#include +#include #include #include \"${INPUTFILE}_${CLASS}_override.h\" #include \"syscalls_${CLASS}_override.h\" @@ -290,7 +290,7 @@ echo \ #endif /* _TRACE_SYSCALLS_${CLASSCAP}_H */ /* This part must be outside protection */ -#include +#include #else /* CREATE_SYSCALL_TABLE */ diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c index b777c40d..009cfed0 100644 --- a/probes/lttng-probe-user.c +++ b/probes/lttng-probe-user.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include /* * Calculate string length. Include final null terminating character if there is diff --git a/probes/lttng.h b/probes/lttng.h deleted file mode 100644 index 7d153be3..00000000 --- a/probes/lttng.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) - * - * lttng.h - * - * Copyright (C) 2010-2012 Mathieu Desnoyers - */ - -#ifndef _LTTNG_PROBES_LTTNG_H -#define _LTTNG_PROBES_LTTNG_H - -#undef PARAMS -#define PARAMS(args...) args - -#endif /* _LTTNG_PROBES_LTTNG_H */ -- 2.34.1