From 2df37e95fa4303ecc0db41334452665491533641 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 6 May 2020 10:18:46 -0400 Subject: [PATCH] Cleanup: Move headers from toplevel to include/lttng/ - Remove extra "lttng-" from filename (now implied by the path). - Adapt includes accordingly. Signed-off-by: Mathieu Desnoyers --- LICENSE | 6 +++--- blacklist/kprobes.h | 2 +- blacklist/timekeeping.h | 2 +- lttng-abi-old.h => include/lttng/abi-old.h | 4 ++-- lttng-abi.h => include/lttng/abi.h | 14 +++++++------- include/lttng/bitfield.h | 2 +- lttng-clock.h => include/lttng/clock.h | 2 +- lttng-cpuhotplug.h => include/lttng/cpuhotplug.h | 2 +- lttng-endian.h => include/lttng/endian.h | 2 +- lttng-events.h => include/lttng/events.h | 12 ++++++------ .../lttng/filter-bytecode.h | 2 +- lttng-filter.h => include/lttng/filter.h | 6 +++--- .../lttng/kernel-version.h | 2 +- .../lttng/string-utils.h | 0 lttng-tp-mempool.h => include/lttng/tp-mempool.h | 2 +- include/lttng/tracepoint-event-impl.h | 10 +++++----- lttng-tracepoint.h => include/lttng/tracepoint.h | 2 +- lttng-tracer-core.h => include/lttng/tracer-core.h | 2 +- lttng-tracer.h => include/lttng/tracer.h | 6 +++--- include/lttng/types.h | 6 +++--- include/ringbuffer/backend_types.h | 4 ++-- include/ringbuffer/config.h | 4 ++-- include/ringbuffer/frontend_types.h | 2 +- instrumentation/events/lttng-module/net.h | 2 +- lib/ringbuffer/ring_buffer_vfs.c | 2 +- lttng-abi.c | 12 ++++++------ lttng-calibrate.c | 4 ++-- lttng-clock.c | 4 ++-- lttng-context-callstack.c | 6 +++--- lttng-context-cgroup-ns.c | 4 ++-- lttng-context-cpu-id.c | 4 ++-- lttng-context-egid.c | 4 ++-- lttng-context-euid.c | 4 ++-- lttng-context-gid.c | 4 ++-- lttng-context-hostname.c | 4 ++-- lttng-context-interruptible.c | 4 ++-- lttng-context-ipc-ns.c | 4 ++-- lttng-context-migratable.c | 4 ++-- lttng-context-mnt-ns.c | 4 ++-- lttng-context-need-reschedule.c | 4 ++-- lttng-context-net-ns.c | 4 ++-- lttng-context-nice.c | 4 ++-- lttng-context-perf-counters.c | 4 ++-- lttng-context-pid-ns.c | 4 ++-- lttng-context-pid.c | 4 ++-- lttng-context-ppid.c | 4 ++-- lttng-context-preemptible.c | 4 ++-- lttng-context-prio.c | 4 ++-- lttng-context-procname.c | 6 +++--- lttng-context-sgid.c | 4 ++-- lttng-context-suid.c | 4 ++-- lttng-context-tid.c | 4 ++-- lttng-context-uid.c | 4 ++-- lttng-context-user-ns.c | 4 ++-- lttng-context-uts-ns.c | 4 ++-- lttng-context-vegid.c | 4 ++-- lttng-context-veuid.c | 4 ++-- lttng-context-vgid.c | 4 ++-- lttng-context-vpid.c | 4 ++-- lttng-context-vppid.c | 4 ++-- lttng-context-vsgid.c | 4 ++-- lttng-context-vsuid.c | 4 ++-- lttng-context-vtid.c | 4 ++-- lttng-context-vuid.c | 4 ++-- lttng-context.c | 4 ++-- lttng-events.c | 12 ++++++------ lttng-filter-interpreter.c | 4 ++-- lttng-filter-specialize.c | 2 +- lttng-filter-validator.c | 2 +- lttng-filter.c | 2 +- lttng-probes.c | 2 +- lttng-ring-buffer-client-discard.c | 2 +- lttng-ring-buffer-client-mmap-discard.c | 2 +- lttng-ring-buffer-client-mmap-overwrite.c | 2 +- lttng-ring-buffer-client-overwrite.c | 2 +- lttng-ring-buffer-client.h | 4 ++-- lttng-ring-buffer-metadata-client.c | 2 +- lttng-ring-buffer-metadata-client.h | 4 ++-- lttng-ring-buffer-metadata-mmap-client.c | 2 +- lttng-statedump-impl.c | 4 ++-- lttng-string-utils.c | 2 +- lttng-syscalls.c | 2 +- lttng-tp-mempool.c | 2 +- lttng-tracepoint.c | 2 +- lttng-tracker-id.c | 2 +- lttng-wrapper-impl.c | 2 +- probes/lttng-kprobes.c | 4 ++-- probes/lttng-kretprobes.c | 4 ++-- probes/lttng-probe-9p.c | 2 +- probes/lttng-probe-asoc.c | 2 +- probes/lttng-probe-block.c | 4 ++-- probes/lttng-probe-btrfs.c | 2 +- probes/lttng-probe-compaction.c | 2 +- probes/lttng-probe-ext3.c | 2 +- probes/lttng-probe-ext4.c | 4 ++-- probes/lttng-probe-gpio.c | 2 +- probes/lttng-probe-i2c.c | 2 +- probes/lttng-probe-irq.c | 2 +- probes/lttng-probe-jbd.c | 2 +- probes/lttng-probe-jbd2.c | 2 +- probes/lttng-probe-kmem.c | 2 +- probes/lttng-probe-kvm-x86-mmu.c | 4 ++-- probes/lttng-probe-kvm-x86.c | 4 ++-- probes/lttng-probe-kvm.c | 2 +- probes/lttng-probe-lock.c | 2 +- probes/lttng-probe-module.c | 2 +- probes/lttng-probe-napi.c | 2 +- probes/lttng-probe-net.c | 2 +- probes/lttng-probe-power.c | 2 +- probes/lttng-probe-preemptirq.c | 2 +- probes/lttng-probe-printk.c | 2 +- probes/lttng-probe-random.c | 2 +- probes/lttng-probe-rcu.c | 2 +- probes/lttng-probe-regmap.c | 4 ++-- probes/lttng-probe-regulator.c | 2 +- probes/lttng-probe-rpm.c | 2 +- probes/lttng-probe-sched.c | 2 +- probes/lttng-probe-scsi.c | 2 +- probes/lttng-probe-signal.c | 2 +- probes/lttng-probe-skb.c | 2 +- probes/lttng-probe-sock.c | 2 +- probes/lttng-probe-statedump.c | 4 ++-- probes/lttng-probe-sunrpc.c | 2 +- probes/lttng-probe-timer.c | 2 +- probes/lttng-probe-udp.c | 2 +- probes/lttng-probe-v4l2.c | 2 +- probes/lttng-probe-vmscan.c | 4 ++-- probes/lttng-probe-workqueue.c | 2 +- probes/lttng-probe-writeback.c | 4 ++-- probes/lttng-probe-x86-exceptions.c | 2 +- probes/lttng-probe-x86-irq-vectors.c | 2 +- probes/lttng-uprobes.c | 4 ++-- probes/lttng.c | 2 +- tests/clock-plugin/lttng-clock-plugin-test.c | 4 ++-- tests/probes/lttng-test.c | 4 ++-- wrapper/irqdesc.c | 2 +- wrapper/mm.h | 2 +- wrapper/page_alloc.c | 2 +- wrapper/page_alloc.h | 2 +- wrapper/random.h | 2 +- wrapper/splice.c | 2 +- wrapper/syscall.h | 2 +- wrapper/timer.h | 2 +- wrapper/trace-clock.h | 4 ++-- wrapper/tracepoint.h | 2 +- wrapper/uaccess.h | 2 +- wrapper/writeback.h | 2 +- 147 files changed, 241 insertions(+), 241 deletions(-) rename lttng-abi-old.h => include/lttng/abi-old.h (98%) rename lttng-abi.h => include/lttng/abi.h (97%) rename lttng-clock.h => include/lttng/clock.h (97%) rename lttng-cpuhotplug.h => include/lttng/cpuhotplug.h (98%) rename lttng-endian.h => include/lttng/endian.h (97%) rename lttng-events.h => include/lttng/events.h (99%) rename filter-bytecode.h => include/lttng/filter-bytecode.h (99%) rename lttng-filter.h => include/lttng/filter.h (98%) rename lttng-kernel-version.h => include/lttng/kernel-version.h (99%) rename lttng-string-utils.h => include/lttng/string-utils.h (100%) rename lttng-tp-mempool.h => include/lttng/tp-mempool.h (98%) rename lttng-tracepoint.h => include/lttng/tracepoint.h (96%) rename lttng-tracer-core.h => include/lttng/tracer-core.h (96%) rename lttng-tracer.h => include/lttng/tracer.h (96%) diff --git a/LICENSE b/LICENSE index caf91c66..04013e66 100644 --- a/LICENSE +++ b/LICENSE @@ -24,11 +24,11 @@ These files are licensed under an MIT-style license. See LICENSES/MIT for details. include/lttng/prio_heap.h -lib/prio_heap/lttng_prio_heap.c include/lttng/bitfield.h -filter-bytecode.h +include/lttng/filter-bytecode.h +include/filter.h +lib/prio_heap/lttng_prio_heap.c lttng-filter-interpreter.c lttng-filter-specialize.c lttng-filter-validator.c lttng-filter.c -lttng-filter.h diff --git a/blacklist/kprobes.h b/blacklist/kprobes.h index 5740d8d7..4c52c3d9 100644 --- a/blacklist/kprobes.h +++ b/blacklist/kprobes.h @@ -10,7 +10,7 @@ #ifndef _LTTNG_BLACKLIST_KPROBES_H #define _LTTNG_BLACKLIST_KPROBES_H -#include +#include #if LTTNG_KERNEL_RANGE(4,20,0, 4,20,13) \ || LTTNG_KERNEL_RANGE(4,19,9, 4,19,26) \ diff --git a/blacklist/timekeeping.h b/blacklist/timekeeping.h index ac8081a3..96e55d1e 100644 --- a/blacklist/timekeeping.h +++ b/blacklist/timekeeping.h @@ -10,7 +10,7 @@ #ifndef _LTTNG_BLACKLIST_TIMEKEEPING_H #define _LTTNG_BLACKLIST_TIMEKEEPING_H -#include +#include #if ((LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) && !LTTNG_RHEL_KERNEL_RANGE(3,10,0,123,0,0, 3,10,14,0,0,0)) \ || LTTNG_KERNEL_RANGE(3,11,0, 3,11,3)) diff --git a/lttng-abi-old.h b/include/lttng/abi-old.h similarity index 98% rename from lttng-abi-old.h rename to include/lttng/abi-old.h index 0b1c7b11..ac8d938e 100644 --- a/lttng-abi-old.h +++ b/include/lttng/abi-old.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-abi-old.h + * lttng/abi-old.h * * LTTng old ABI header (without support for compat 32/64 bits) * @@ -11,7 +11,7 @@ #define _LTTNG_ABI_OLD_H #include -#include +#include /* * LTTng DebugFS ABI structures. diff --git a/lttng-abi.h b/include/lttng/abi.h similarity index 97% rename from lttng-abi.h rename to include/lttng/abi.h index a26c7ee0..b8e2db39 100644 --- a/lttng-abi.h +++ b/include/lttng/abi.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-abi.h + * lttng/abi.h * * LTTng ABI header * @@ -225,7 +225,7 @@ struct lttng_kernel_tracker_args { }; /* LTTng file descriptor ioctl */ -/* lttng-abi-old.h reserve 0x40, 0x41, 0x42, 0x43, and 0x44. */ +/* lttng/abi-old.h reserve 0x40, 0x41, 0x42, 0x43, and 0x44. */ #define LTTNG_KERNEL_SESSION _IO(0xF6, 0x45) #define LTTNG_KERNEL_TRACER_VERSION \ _IOR(0xF6, 0x46, struct lttng_kernel_tracer_version) @@ -238,7 +238,7 @@ struct lttng_kernel_tracker_args { _IOR(0xF6, 0x4B, struct lttng_kernel_tracer_abi_version) /* Session FD ioctl */ -/* lttng-abi-old.h reserve 0x50, 0x51, 0x52, and 0x53. */ +/* lttng/abi-old.h reserve 0x50, 0x51, 0x52, and 0x53. */ #define LTTNG_KERNEL_METADATA \ _IOW(0xF6, 0x54, struct lttng_kernel_channel) #define LTTNG_KERNEL_CHANNEL \ @@ -258,7 +258,7 @@ struct lttng_kernel_tracker_args { #define LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS _IO(0xF6, 0x58) #define LTTNG_KERNEL_SESSION_METADATA_REGEN _IO(0xF6, 0x59) -/* lttng-abi-old.h reserve 0x5A and 0x5B. */ +/* lttng/abi-old.h reserve 0x5A and 0x5B. */ #define LTTNG_KERNEL_SESSION_STATEDUMP _IO(0xF6, 0x5C) #define LTTNG_KERNEL_SESSION_SET_NAME \ _IOR(0xF6, 0x5D, struct lttng_kernel_session_name) @@ -266,7 +266,7 @@ struct lttng_kernel_tracker_args { _IOR(0xF6, 0x5E, struct lttng_kernel_session_creation_time) /* Channel FD ioctl */ -/* lttng-abi-old.h reserve 0x60 and 0x61. */ +/* lttng/abi-old.h reserve 0x60 and 0x61. */ #define LTTNG_KERNEL_STREAM _IO(0xF6, 0x62) #define LTTNG_KERNEL_EVENT \ _IOW(0xF6, 0x63, struct lttng_kernel_event) @@ -274,12 +274,12 @@ struct lttng_kernel_tracker_args { _IOWR(0xF6, 0x64, struct lttng_kernel_syscall_mask) /* Event and Channel FD ioctl */ -/* lttng-abi-old.h reserve 0x70. */ +/* lttng/abi-old.h reserve 0x70. */ #define LTTNG_KERNEL_CONTEXT \ _IOW(0xF6, 0x71, struct lttng_kernel_context) /* Event, Channel and Session ioctl */ -/* lttng-abi-old.h reserve 0x80 and 0x81. */ +/* lttng/abi-old.h reserve 0x80 and 0x81. */ #define LTTNG_KERNEL_ENABLE _IO(0xF6, 0x82) #define LTTNG_KERNEL_DISABLE _IO(0xF6, 0x83) diff --git a/include/lttng/bitfield.h b/include/lttng/bitfield.h index 7d5eaeaa..8ccb108d 100644 --- a/include/lttng/bitfield.h +++ b/include/lttng/bitfield.h @@ -7,7 +7,7 @@ #define _BABELTRACE_BITFIELD_H #include -#include +#include #ifndef CHAR_BIT #define CHAR_BIT 8 diff --git a/lttng-clock.h b/include/lttng/clock.h similarity index 97% rename from lttng-clock.h rename to include/lttng/clock.h index cac3c72e..01d35708 100644 --- a/lttng-clock.h +++ b/include/lttng/clock.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-clock.h + * lttng/clock.h * * Copyright (C) 2014 Mathieu Desnoyers */ diff --git a/lttng-cpuhotplug.h b/include/lttng/cpuhotplug.h similarity index 98% rename from lttng-cpuhotplug.h rename to include/lttng/cpuhotplug.h index 4e25b39f..5c2f2565 100644 --- a/lttng-cpuhotplug.h +++ b/include/lttng/cpuhotplug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-cpuhotplug.h + * lttng/cpuhotplug.h * * Copyright (C) 2016 Mathieu Desnoyers */ diff --git a/lttng-endian.h b/include/lttng/endian.h similarity index 97% rename from lttng-endian.h rename to include/lttng/endian.h index 12f55d17..399ec20d 100644 --- a/lttng-endian.h +++ b/include/lttng/endian.h @@ -3,7 +3,7 @@ #define _LTTNG_ENDIAN_H /* - * lttng-endian.h + * lttng/endian.h * * Copyright (C) 2010-2012 Mathieu Desnoyers */ diff --git a/lttng-events.h b/include/lttng/events.h similarity index 99% rename from lttng-events.h rename to include/lttng/events.h index 8197eb83..c9d664f1 100644 --- a/lttng-events.h +++ b/include/lttng/events.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-events.h + * lttng/events.h * * Holds LTTng per-session event registry. * @@ -14,13 +14,13 @@ #include #include #include -#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define lttng_is_signed_type(type) (((type)(-1)) < 0) diff --git a/filter-bytecode.h b/include/lttng/filter-bytecode.h similarity index 99% rename from filter-bytecode.h rename to include/lttng/filter-bytecode.h index 65d34f02..cc1a8412 100644 --- a/filter-bytecode.h +++ b/include/lttng/filter-bytecode.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT * - * filter-bytecode.h + * lttng/filter-bytecode.h * * LTTng filter bytecode * diff --git a/lttng-filter.h b/include/lttng/filter.h similarity index 98% rename from lttng-filter.h rename to include/lttng/filter.h index fec2db1f..eb70fe36 100644 --- a/lttng-filter.h +++ b/include/lttng/filter.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT * - * lttng-filter.h + * lttng/filter.h * * LTTng modules filter header. * @@ -12,8 +12,8 @@ #include -#include -#include +#include +#include /* Filter stack length, in number of entries */ #define FILTER_STACK_LEN 10 /* includes 2 dummy */ diff --git a/lttng-kernel-version.h b/include/lttng/kernel-version.h similarity index 99% rename from lttng-kernel-version.h rename to include/lttng/kernel-version.h index cb96a325..a97cc024 100644 --- a/lttng-kernel-version.h +++ b/include/lttng/kernel-version.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-kernel-version.h + * lttng/kernel-version.h * * Contains helpers to check more complex kernel version conditions. * diff --git a/lttng-string-utils.h b/include/lttng/string-utils.h similarity index 100% rename from lttng-string-utils.h rename to include/lttng/string-utils.h diff --git a/lttng-tp-mempool.h b/include/lttng/tp-mempool.h similarity index 98% rename from lttng-tp-mempool.h rename to include/lttng/tp-mempool.h index f925efa9..587e9bdb 100644 --- a/lttng-tp-mempool.h +++ b/include/lttng/tp-mempool.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-tp-mempool.h + * lttng/tp-mempool.h * * Copyright (C) 2018 Julien Desfossez */ diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h index 25077772..b5094619 100644 --- a/include/lttng/tracepoint-event-impl.h +++ b/include/lttng/tracepoint-event-impl.h @@ -12,16 +12,16 @@ #include #include -#include -#include #include /* for wrapper_vmalloc_sync_mappings() */ #include #include #include #include -#include -#include -#include +#include +#include +#include +#include +#include #define __LTTNG_NULL_STRING "(null)" diff --git a/lttng-tracepoint.h b/include/lttng/tracepoint.h similarity index 96% rename from lttng-tracepoint.h rename to include/lttng/tracepoint.h index 12cc5954..a2316b6c 100644 --- a/lttng-tracepoint.h +++ b/include/lttng/tracepoint.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-tracepoint.h + * lttng/tracepoint.h * * LTTng adaptation layer for Linux kernel 3.15+ tracepoints. * diff --git a/lttng-tracer-core.h b/include/lttng/tracer-core.h similarity index 96% rename from lttng-tracer-core.h rename to include/lttng/tracer-core.h index 18716738..d8049aa5 100644 --- a/lttng-tracer-core.h +++ b/include/lttng/tracer-core.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * - * lttng-tracer-core.h + * lttng/tracer-core.h * * This contains the core definitions for the Linux Trace Toolkit Next * Generation tracer. diff --git a/lttng-tracer.h b/include/lttng/tracer.h similarity index 96% rename from lttng-tracer.h rename to include/lttng/tracer.h index 197e28af..671a39cc 100644 --- a/lttng-tracer.h +++ b/include/lttng/tracer.h @@ -3,7 +3,7 @@ #define _LTTNG_TRACER_H /* - * lttng-tracer.h + * lttng/tracer.h * * This contains the definitions for the Linux Trace Toolkit Next * Generation tracer. @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #define LTTNG_MODULES_MAJOR_VERSION 2 #define LTTNG_MODULES_MINOR_VERSION 12 diff --git a/include/lttng/types.h b/include/lttng/types.h index fa09dce3..e5e25e0e 100644 --- a/include/lttng/types.h +++ b/include/lttng/types.h @@ -15,9 +15,9 @@ #define _LTTNG_PROBES_LTTNG_TYPES_H #include -#include -#include -#include +#include +#include +#include #endif /* _LTTNG_PROBES_LTTNG_TYPES_H */ diff --git a/include/ringbuffer/backend_types.h b/include/ringbuffer/backend_types.h index cfeecf4f..37a3bb8c 100644 --- a/include/ringbuffer/backend_types.h +++ b/include/ringbuffer/backend_types.h @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include struct lib_ring_buffer_backend_page { void *virt; /* page virtual address (cached) */ diff --git a/include/ringbuffer/config.h b/include/ringbuffer/config.h index 1549c108..a17d2202 100644 --- a/include/ringbuffer/config.h +++ b/include/ringbuffer/config.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include struct lib_ring_buffer; struct channel; @@ -234,7 +234,7 @@ void lib_ring_buffer_ctx_init(struct lib_ring_buffer_ctx *ctx, #define RING_BUFFER_RFLAG_END (1U << 1) #ifndef LTTNG_TRACER_CORE_H -#error "lttng-tracer-core.h is needed for RING_BUFFER_ALIGN define" +#error "lttng/tracer-core.h is needed for RING_BUFFER_ALIGN define" #endif /* diff --git a/include/ringbuffer/frontend_types.h b/include/ringbuffer/frontend_types.h index d5c4916b..07be81aa 100644 --- a/include/ringbuffer/frontend_types.h +++ b/include/ringbuffer/frontend_types.h @@ -16,7 +16,7 @@ #include #include #include /* For per-CPU read-side iterator */ -#include +#include /* * A switch is done during tracing or as a final flush after tracing (so it diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h index e42fb2ec..c2d8c67b 100644 --- a/instrumentation/events/lttng-module/net.h +++ b/instrumentation/events/lttng-module/net.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #ifndef ONCE_LTTNG_NET_H diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c index 2be550c4..e5d6a701 100644 --- a/lib/ringbuffer/ring_buffer_vfs.c +++ b/lib/ringbuffer/ring_buffer_vfs.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include static int put_ulong(unsigned long val, unsigned long arg) { diff --git a/lttng-abi.c b/lttng-abi.c index 1b5239e5..01eb4d55 100644 --- a/lttng-abi.c +++ b/lttng-abi.c @@ -37,12 +37,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include /* diff --git a/lttng-calibrate.c b/lttng-calibrate.c index ef6c6121..38863194 100644 --- a/lttng-calibrate.c +++ b/lttng-calibrate.c @@ -7,8 +7,8 @@ * Copyright (C) 2010-2012 Mathieu Desnoyers */ -#include -#include +#include +#include noinline void lttng_calibrate_kretprobe(void) diff --git a/lttng-clock.c b/lttng-clock.c index 1fe37b80..7512a3f4 100644 --- a/lttng-clock.c +++ b/lttng-clock.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include struct lttng_trace_clock *lttng_trace_clock; EXPORT_SYMBOL_GPL(lttng_trace_clock); diff --git a/lttng-context-callstack.c b/lttng-context-callstack.c index e8be78fa..7b9e6512 100644 --- a/lttng-context-callstack.c +++ b/lttng-context-callstack.c @@ -43,12 +43,12 @@ #include #include #include -#include "lttng-events.h" #include #include +#include +#include +#include #include "wrapper/vmalloc.h" -#include "lttng-tracer.h" -#include "lttng-endian.h" #ifdef CONFIG_ARCH_STACKWALK #include "lttng-context-callstack-stackwalk-impl.h" diff --git a/lttng-context-cgroup-ns.c b/lttng-context-cgroup-ns.c index eebedeb5..27f00f6b 100644 --- a/lttng-context-cgroup-ns.c +++ b/lttng-context-cgroup-ns.c @@ -13,11 +13,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #if defined(CONFIG_CGROUPS) && \ ((LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) || \ diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c index 1f79a5e9..498dfcf0 100644 --- a/lttng-context-cpu-id.c +++ b/lttng-context-cpu-id.c @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t cpu_id_get_size(size_t offset) diff --git a/lttng-context-egid.c b/lttng-context-egid.c index 535402a2..e649fec8 100644 --- a/lttng-context-egid.c +++ b/lttng-context-egid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-euid.c b/lttng-context-euid.c index 3e6d03f9..79faf3ac 100644 --- a/lttng-context-euid.c +++ b/lttng-context-euid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-gid.c b/lttng-context-gid.c index 0508c9ba..5620469d 100644 --- a/lttng-context-gid.c +++ b/lttng-context-gid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-hostname.c b/lttng-context-hostname.c index b8fa5149..86c5d021 100644 --- a/lttng-context-hostname.c +++ b/lttng-context-hostname.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include #define LTTNG_HOSTNAME_CTX_LEN (__NEW_UTS_LEN + 1) diff --git a/lttng-context-interruptible.c b/lttng-context-interruptible.c index 62e8583d..9fbf266d 100644 --- a/lttng-context-interruptible.c +++ b/lttng-context-interruptible.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include /* * Interruptible at value -1 means "unknown". diff --git a/lttng-context-ipc-ns.c b/lttng-context-ipc-ns.c index 61c193ca..a1129225 100644 --- a/lttng-context-ipc-ns.c +++ b/lttng-context-ipc-ns.c @@ -13,11 +13,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #if defined(CONFIG_IPC_NS) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) diff --git a/lttng-context-migratable.c b/lttng-context-migratable.c index 1e7cdeab..207e02ff 100644 --- a/lttng-context-migratable.c +++ b/lttng-context-migratable.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t migratable_get_size(size_t offset) diff --git a/lttng-context-mnt-ns.c b/lttng-context-mnt-ns.c index 5d396aef..7fce5dd1 100644 --- a/lttng-context-mnt-ns.c +++ b/lttng-context-mnt-ns.c @@ -12,12 +12,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) diff --git a/lttng-context-need-reschedule.c b/lttng-context-need-reschedule.c index 2b16c270..7f8deec2 100644 --- a/lttng-context-need-reschedule.c +++ b/lttng-context-need-reschedule.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t need_reschedule_get_size(size_t offset) diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c index 74cf8f82..879a61bd 100644 --- a/lttng-context-net-ns.c +++ b/lttng-context-net-ns.c @@ -14,11 +14,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #if defined(CONFIG_NET_NS) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) diff --git a/lttng-context-nice.c b/lttng-context-nice.c index 095462eb..aaa3643e 100644 --- a/lttng-context-nice.c +++ b/lttng-context-nice.c @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t nice_get_size(size_t offset) diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c index 05a28ab5..5784f75e 100644 --- a/lttng-context-perf-counters.c +++ b/lttng-context-perf-counters.c @@ -13,11 +13,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include static size_t perf_counter_get_size(size_t offset) diff --git a/lttng-context-pid-ns.c b/lttng-context-pid-ns.c index e0f5636a..721485df 100644 --- a/lttng-context-pid-ns.c +++ b/lttng-context-pid-ns.c @@ -13,11 +13,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #if defined(CONFIG_PID_NS) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) diff --git a/lttng-context-pid.c b/lttng-context-pid.c index a84a284c..f3e4aef1 100644 --- a/lttng-context-pid.c +++ b/lttng-context-pid.c @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t pid_get_size(size_t offset) diff --git a/lttng-context-ppid.c b/lttng-context-ppid.c index 44956c7e..854c5159 100644 --- a/lttng-context-ppid.c +++ b/lttng-context-ppid.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t ppid_get_size(size_t offset) diff --git a/lttng-context-preemptible.c b/lttng-context-preemptible.c index 0bd8e912..6130a1a2 100644 --- a/lttng-context-preemptible.c +++ b/lttng-context-preemptible.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include /* * We nest twice in preempt disabling within LTTng: one nesting is done diff --git a/lttng-context-prio.c b/lttng-context-prio.c index 84d5c5bf..d3004455 100644 --- a/lttng-context-prio.c +++ b/lttng-context-prio.c @@ -10,11 +10,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include static int (*wrapper_task_prio_sym)(struct task_struct *t); diff --git a/lttng-context-procname.c b/lttng-context-procname.c index 3fd82369..fb5c36b8 100644 --- a/lttng-context-procname.c +++ b/lttng-context-procname.c @@ -10,11 +10,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include static size_t procname_get_size(size_t offset) diff --git a/lttng-context-sgid.c b/lttng-context-sgid.c index a729d0bb..18f1b837 100644 --- a/lttng-context-sgid.c +++ b/lttng-context-sgid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-suid.c b/lttng-context-suid.c index 79087471..1aa52dc5 100644 --- a/lttng-context-suid.c +++ b/lttng-context-suid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-tid.c b/lttng-context-tid.c index 144b081b..31161308 100644 --- a/lttng-context-tid.c +++ b/lttng-context-tid.c @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t tid_get_size(size_t offset) diff --git a/lttng-context-uid.c b/lttng-context-uid.c index c639dc18..c48bd0a6 100644 --- a/lttng-context-uid.c +++ b/lttng-context-uid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c index 3bee6d65..b2c1189d 100644 --- a/lttng-context-user-ns.c +++ b/lttng-context-user-ns.c @@ -13,11 +13,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #if defined(CONFIG_USER_NS) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) diff --git a/lttng-context-uts-ns.c b/lttng-context-uts-ns.c index 02192e7f..b4284a5c 100644 --- a/lttng-context-uts-ns.c +++ b/lttng-context-uts-ns.c @@ -13,11 +13,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #if defined(CONFIG_UTS_NS) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) diff --git a/lttng-context-vegid.c b/lttng-context-vegid.c index abd81aa3..6207e61c 100644 --- a/lttng-context-vegid.c +++ b/lttng-context-vegid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-veuid.c b/lttng-context-veuid.c index f032b3a6..a2498208 100644 --- a/lttng-context-veuid.c +++ b/lttng-context-veuid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-vgid.c b/lttng-context-vgid.c index 5c70003c..a833915f 100644 --- a/lttng-context-vgid.c +++ b/lttng-context-vgid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c index 979d52aa..28178b9e 100644 --- a/lttng-context-vpid.c +++ b/lttng-context-vpid.c @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t vpid_get_size(size_t offset) diff --git a/lttng-context-vppid.c b/lttng-context-vppid.c index cedf6804..8757eb29 100644 --- a/lttng-context-vppid.c +++ b/lttng-context-vppid.c @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t vppid_get_size(size_t offset) diff --git a/lttng-context-vsgid.c b/lttng-context-vsgid.c index 82ada637..c6a6ea7c 100644 --- a/lttng-context-vsgid.c +++ b/lttng-context-vsgid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-vsuid.c b/lttng-context-vsuid.c index fab50726..c22d4304 100644 --- a/lttng-context-vsuid.c +++ b/lttng-context-vsuid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context-vtid.c b/lttng-context-vtid.c index 74198d02..3b0cadc4 100644 --- a/lttng-context-vtid.c +++ b/lttng-context-vtid.c @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include static size_t vtid_get_size(size_t offset) diff --git a/lttng-context-vuid.c b/lttng-context-vuid.c index 13fb70ef..e83f8989 100644 --- a/lttng-context-vuid.c +++ b/lttng-context-vuid.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-context.c b/lttng-context.c index b4a60038..eb5e5d11 100644 --- a/lttng-context.c +++ b/lttng-context.c @@ -12,8 +12,8 @@ #include #include #include /* for wrapper_vmalloc_sync_mappings() */ -#include -#include +#include +#include /* * The filter implementation requires that two consecutive "get" for the diff --git a/lttng-events.c b/lttng-events.c index d22bf327..e22cc811 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -35,12 +35,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c index c7ce7d33..5ba7e230 100644 --- a/lttng-filter-interpreter.c +++ b/lttng-filter-interpreter.c @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode); diff --git a/lttng-filter-specialize.c b/lttng-filter-specialize.c index f0da47ed..ccc45835 100644 --- a/lttng-filter-specialize.c +++ b/lttng-filter-specialize.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include static ssize_t bytecode_reserve_data(struct bytecode_runtime *runtime, diff --git a/lttng-filter-validator.c b/lttng-filter-validator.c index c479af08..38d6ed07 100644 --- a/lttng-filter-validator.c +++ b/lttng-filter-validator.c @@ -12,7 +12,7 @@ #include #include -#include +#include #define MERGE_POINT_TABLE_BITS 7 #define MERGE_POINT_TABLE_SIZE (1U << MERGE_POINT_TABLE_BITS) diff --git a/lttng-filter.c b/lttng-filter.c index 6ff6be8f..12c22644 100644 --- a/lttng-filter.c +++ b/lttng-filter.c @@ -10,7 +10,7 @@ #include #include -#include +#include static const char *opnames[] = { [ FILTER_OP_UNKNOWN ] = "UNKNOWN", diff --git a/lttng-probes.c b/lttng-probes.c index bf6615b7..4a2bb630 100644 --- a/lttng-probes.c +++ b/lttng-probes.c @@ -12,7 +12,7 @@ #include #include -#include +#include /* * probe list is protected by sessions lock. diff --git a/lttng-ring-buffer-client-discard.c b/lttng-ring-buffer-client-discard.c index 64d7e9ec..c9d617ad 100644 --- a/lttng-ring-buffer-client-discard.c +++ b/lttng-ring-buffer-client-discard.c @@ -8,7 +8,7 @@ */ #include -#include +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "discard" diff --git a/lttng-ring-buffer-client-mmap-discard.c b/lttng-ring-buffer-client-mmap-discard.c index 9147e58b..c79ab66a 100644 --- a/lttng-ring-buffer-client-mmap-discard.c +++ b/lttng-ring-buffer-client-mmap-discard.c @@ -8,7 +8,7 @@ */ #include -#include +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "discard-mmap" diff --git a/lttng-ring-buffer-client-mmap-overwrite.c b/lttng-ring-buffer-client-mmap-overwrite.c index 4494ac4b..1166fc70 100644 --- a/lttng-ring-buffer-client-mmap-overwrite.c +++ b/lttng-ring-buffer-client-mmap-overwrite.c @@ -8,7 +8,7 @@ */ #include -#include +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_OVERWRITE #define RING_BUFFER_MODE_TEMPLATE_STRING "overwrite-mmap" diff --git a/lttng-ring-buffer-client-overwrite.c b/lttng-ring-buffer-client-overwrite.c index d4566296..c4a7c5eb 100644 --- a/lttng-ring-buffer-client-overwrite.c +++ b/lttng-ring-buffer-client-overwrite.c @@ -8,7 +8,7 @@ */ #include -#include +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_OVERWRITE #define RING_BUFFER_MODE_TEMPLATE_STRING "overwrite" diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h index 67804d3a..aad7955f 100644 --- a/lttng-ring-buffer-client.h +++ b/lttng-ring-buffer-client.h @@ -12,8 +12,8 @@ #include #include /* for wrapper_vmalloc_sync_mappings() */ #include -#include -#include +#include +#include #include #define LTTNG_COMPACT_EVENT_BITS 5 diff --git a/lttng-ring-buffer-metadata-client.c b/lttng-ring-buffer-metadata-client.c index 7a785677..2d524922 100644 --- a/lttng-ring-buffer-metadata-client.c +++ b/lttng-ring-buffer-metadata-client.c @@ -8,7 +8,7 @@ */ #include -#include +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "metadata" diff --git a/lttng-ring-buffer-metadata-client.h b/lttng-ring-buffer-metadata-client.h index 9b9ac2c2..0f68b385 100644 --- a/lttng-ring-buffer-metadata-client.h +++ b/lttng-ring-buffer-metadata-client.h @@ -10,8 +10,8 @@ #include #include #include /* for wrapper_vmalloc_sync_mappings() */ -#include -#include +#include +#include static struct lttng_transport lttng_relay_transport; diff --git a/lttng-ring-buffer-metadata-mmap-client.c b/lttng-ring-buffer-metadata-mmap-client.c index fc33f99b..15975b41 100644 --- a/lttng-ring-buffer-metadata-mmap-client.c +++ b/lttng-ring-buffer-metadata-mmap-client.c @@ -8,7 +8,7 @@ */ #include -#include +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "metadata-mmap" diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index 9dc0eb19..da05924f 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lttng-string-utils.c b/lttng-string-utils.c index 1f126185..d9447903 100644 --- a/lttng-string-utils.c +++ b/lttng-string-utils.c @@ -5,7 +5,7 @@ #include -#include +#include enum star_glob_pattern_type_flags { STAR_GLOB_PATTERN_TYPE_FLAG_NONE = 0, diff --git a/lttng-syscalls.c b/lttng-syscalls.c index a376bcbe..a5b5f403 100644 --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #ifndef CONFIG_COMPAT # ifndef is_compat_task diff --git a/lttng-tp-mempool.c b/lttng-tp-mempool.c index 7e1b51d3..70ee5cc6 100644 --- a/lttng-tp-mempool.c +++ b/lttng-tp-mempool.c @@ -8,7 +8,7 @@ #include #include -#include +#include struct lttng_tp_buf_entry { int cpu; /* To make sure we return the entry to the right pool. */ diff --git a/lttng-tracepoint.c b/lttng-tracepoint.c index 42bae9ae..ed78a177 100644 --- a/lttng-tracepoint.c +++ b/lttng-tracepoint.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/lttng-tracker-id.c b/lttng-tracker-id.c index 2248acd6..205c4af4 100644 --- a/lttng-tracker-id.c +++ b/lttng-tracker-id.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include /* * Hash table is allocated and freed when there are no possible diff --git a/lttng-wrapper-impl.c b/lttng-wrapper-impl.c index 61319699..cef4fc7a 100644 --- a/lttng-wrapper-impl.c +++ b/lttng-wrapper-impl.c @@ -6,7 +6,7 @@ */ #include -#include +#include static int __init lttng_wrapper_init(void) { diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c index 6a134732..a2474d0d 100644 --- a/probes/lttng-kprobes.c +++ b/probes/lttng-kprobes.c @@ -10,11 +10,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include static diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c index e95ef7d5..00675937 100644 --- a/probes/lttng-kretprobes.c +++ b/probes/lttng-kretprobes.c @@ -11,11 +11,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include enum lttng_kretprobe_type { diff --git a/probes/lttng-probe-9p.c b/probes/lttng-probe-9p.c index 7d464104..0da7cf4a 100644 --- a/probes/lttng-probe-9p.c +++ b/probes/lttng-probe-9p.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-asoc.c b/probes/lttng-probe-asoc.c index af82cdb8..ce73cea5 100644 --- a/probes/lttng-probe-asoc.c +++ b/probes/lttng-probe-asoc.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c index 1838491b..eceed5df 100644 --- a/probes/lttng-probe-block.c +++ b/probes/lttng-probe-block.c @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-btrfs.c b/probes/lttng-probe-btrfs.c index afb3acb3..b6a38eee 100644 --- a/probes/lttng-probe-btrfs.c +++ b/probes/lttng-probe-btrfs.c @@ -18,7 +18,7 @@ #include <../fs/btrfs/block-group.h> #endif #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-compaction.c b/probes/lttng-probe-compaction.c index b7d5052e..225eef45 100644 --- a/probes/lttng-probe-compaction.c +++ b/probes/lttng-probe-compaction.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-ext3.c b/probes/lttng-probe-ext3.c index 541478b3..a66241fe 100644 --- a/probes/lttng-probe-ext3.c +++ b/probes/lttng-probe-ext3.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) #include <../fs/ext3/ext3.h> diff --git a/probes/lttng-probe-ext4.c b/probes/lttng-probe-ext4.c index 7b6f02e4..4f089f6f 100644 --- a/probes/lttng-probe-ext4.c +++ b/probes/lttng-probe-ext4.c @@ -14,7 +14,7 @@ #include <../fs/ext4/mballoc.h> #include <../fs/ext4/ext4_extents.h> #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -22,7 +22,7 @@ */ #include -#include +#include #include /* diff --git a/probes/lttng-probe-gpio.c b/probes/lttng-probe-gpio.c index 0b90c864..e3c99efc 100644 --- a/probes/lttng-probe-gpio.c +++ b/probes/lttng-probe-gpio.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-i2c.c b/probes/lttng-probe-i2c.c index 2867d173..7c99bf86 100644 --- a/probes/lttng-probe-i2c.c +++ b/probes/lttng-probe-i2c.c @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-irq.c b/probes/lttng-probe-irq.c index 7f95fd61..fec72766 100644 --- a/probes/lttng-probe-irq.c +++ b/probes/lttng-probe-irq.c @@ -9,7 +9,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-jbd.c b/probes/lttng-probe-jbd.c index 25b34e73..f6f89336 100644 --- a/probes/lttng-probe-jbd.c +++ b/probes/lttng-probe-jbd.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-jbd2.c b/probes/lttng-probe-jbd2.c index 4688279a..007cf1e1 100644 --- a/probes/lttng-probe-jbd2.c +++ b/probes/lttng-probe-jbd2.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-kmem.c b/probes/lttng-probe-kmem.c index 9573018f..96340b04 100644 --- a/probes/lttng-probe-kmem.c +++ b/probes/lttng-probe-kmem.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/probes/lttng-probe-kvm-x86-mmu.c index 03e9929f..b915d365 100644 --- a/probes/lttng-probe-kvm-x86-mmu.c +++ b/probes/lttng-probe-kvm-x86-mmu.c @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) #include diff --git a/probes/lttng-probe-kvm-x86.c b/probes/lttng-probe-kvm-x86.c index bb4ffcd6..30a6cc0c 100644 --- a/probes/lttng-probe-kvm-x86.c +++ b/probes/lttng-probe-kvm-x86.c @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) #include diff --git a/probes/lttng-probe-kvm.c b/probes/lttng-probe-kvm.c index 38603d80..93044657 100644 --- a/probes/lttng-probe-kvm.c +++ b/probes/lttng-probe-kvm.c @@ -9,7 +9,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-lock.c b/probes/lttng-probe-lock.c index 12e0194b..0890e591 100644 --- a/probes/lttng-probe-lock.c +++ b/probes/lttng-probe-lock.c @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-module.c b/probes/lttng-probe-module.c index b422e0e8..c0ddf43e 100644 --- a/probes/lttng-probe-module.c +++ b/probes/lttng-probe-module.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-napi.c b/probes/lttng-probe-napi.c index c0c20852..35a8e109 100644 --- a/probes/lttng-probe-napi.c +++ b/probes/lttng-probe-napi.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-net.c b/probes/lttng-probe-net.c index c69bc1ab..c6e7fc56 100644 --- a/probes/lttng-probe-net.c +++ b/probes/lttng-probe-net.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-power.c b/probes/lttng-probe-power.c index 8d806b81..b72d3008 100644 --- a/probes/lttng-probe-power.c +++ b/probes/lttng-probe-power.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-preemptirq.c b/probes/lttng-probe-preemptirq.c index 73ea22bd..d47152f7 100644 --- a/probes/lttng-probe-preemptirq.c +++ b/probes/lttng-probe-preemptirq.c @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-printk.c b/probes/lttng-probe-printk.c index 3476bed8..db32ac60 100644 --- a/probes/lttng-probe-printk.c +++ b/probes/lttng-probe-printk.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-random.c b/probes/lttng-probe-random.c index 918b4c20..6f7787a7 100644 --- a/probes/lttng-probe-random.c +++ b/probes/lttng-probe-random.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-rcu.c b/probes/lttng-probe-rcu.c index df7ddcbf..0d9f0f53 100644 --- a/probes/lttng-probe-rcu.c +++ b/probes/lttng-probe-rcu.c @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-regmap.c b/probes/lttng-probe-regmap.c index 24a03e03..30aab4f3 100644 --- a/probes/lttng-probe-regmap.c +++ b/probes/lttng-probe-regmap.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-regulator.c b/probes/lttng-probe-regulator.c index 51a1e04b..4a7b24b9 100644 --- a/probes/lttng-probe-regulator.c +++ b/probes/lttng-probe-regulator.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-rpm.c b/probes/lttng-probe-rpm.c index 00ccd91a..bb0b58a9 100644 --- a/probes/lttng-probe-rpm.c +++ b/probes/lttng-probe-rpm.c @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-sched.c b/probes/lttng-probe-sched.c index 577cb408..f369d810 100644 --- a/probes/lttng-probe-sched.c +++ b/probes/lttng-probe-sched.c @@ -8,7 +8,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-scsi.c b/probes/lttng-probe-scsi.c index 89e43273..f220cfe8 100644 --- a/probes/lttng-probe-scsi.c +++ b/probes/lttng-probe-scsi.c @@ -10,7 +10,7 @@ #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-signal.c b/probes/lttng-probe-signal.c index fcbfca13..3c270f90 100644 --- a/probes/lttng-probe-signal.c +++ b/probes/lttng-probe-signal.c @@ -8,7 +8,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-skb.c b/probes/lttng-probe-skb.c index d8d88f26..f471fd3e 100644 --- a/probes/lttng-probe-skb.c +++ b/probes/lttng-probe-skb.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-sock.c b/probes/lttng-probe-sock.c index 1d3a4939..2f57d813 100644 --- a/probes/lttng-probe-sock.c +++ b/probes/lttng-probe-sock.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-statedump.c b/probes/lttng-probe-statedump.c index cade8471..ea07697f 100644 --- a/probes/lttng-probe-statedump.c +++ b/probes/lttng-probe-statedump.c @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include /* * Create LTTng tracepoint probes. diff --git a/probes/lttng-probe-sunrpc.c b/probes/lttng-probe-sunrpc.c index bd911a9c..3953d8c5 100644 --- a/probes/lttng-probe-sunrpc.c +++ b/probes/lttng-probe-sunrpc.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-timer.c b/probes/lttng-probe-timer.c index 60e5a0f2..b5ef884b 100644 --- a/probes/lttng-probe-timer.c +++ b/probes/lttng-probe-timer.c @@ -8,7 +8,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-udp.c b/probes/lttng-probe-udp.c index a9fa382b..495c0afd 100644 --- a/probes/lttng-probe-udp.c +++ b/probes/lttng-probe-udp.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-v4l2.c b/probes/lttng-probe-v4l2.c index 78334477..b5ebffab 100644 --- a/probes/lttng-probe-v4l2.c +++ b/probes/lttng-probe-v4l2.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our * trace event macros match the kernel we run on. diff --git a/probes/lttng-probe-vmscan.c b/probes/lttng-probe-vmscan.c index 2cafb965..eb41c545 100644 --- a/probes/lttng-probe-vmscan.c +++ b/probes/lttng-probe-vmscan.c @@ -9,7 +9,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -17,7 +17,7 @@ */ #include -#include +#include /* * Create LTTng tracepoint probes. diff --git a/probes/lttng-probe-workqueue.c b/probes/lttng-probe-workqueue.c index 6a365300..dd5308ea 100644 --- a/probes/lttng-probe-workqueue.c +++ b/probes/lttng-probe-workqueue.c @@ -10,7 +10,7 @@ #include #include -#include +#include struct cpu_workqueue_struct; struct pool_workqueue; diff --git a/probes/lttng-probe-writeback.c b/probes/lttng-probe-writeback.c index 38d1341c..5db92f6e 100644 --- a/probes/lttng-probe-writeback.c +++ b/probes/lttng-probe-writeback.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -19,7 +19,7 @@ */ #include -#include +#include #include /* #if */ diff --git a/probes/lttng-probe-x86-exceptions.c b/probes/lttng-probe-x86-exceptions.c index 5428798f..b7ded802 100644 --- a/probes/lttng-probe-x86-exceptions.c +++ b/probes/lttng-probe-x86-exceptions.c @@ -8,7 +8,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-probe-x86-irq-vectors.c b/probes/lttng-probe-x86-irq-vectors.c index 3c760c1c..5a3da868 100644 --- a/probes/lttng-probe-x86-irq-vectors.c +++ b/probes/lttng-probe-x86-irq-vectors.c @@ -8,7 +8,7 @@ */ #include -#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our diff --git a/probes/lttng-uprobes.c b/probes/lttng-uprobes.c index c29e1814..c0f6e7c3 100644 --- a/probes/lttng-uprobes.c +++ b/probes/lttng-uprobes.c @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/probes/lttng.c b/probes/lttng.c index e571ceea..0d3182ff 100644 --- a/probes/lttng.c +++ b/probes/lttng.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #define TP_MODULE_NOAUTOLOAD #define LTTNG_PACKAGE_BUILD diff --git a/tests/clock-plugin/lttng-clock-plugin-test.c b/tests/clock-plugin/lttng-clock-plugin-test.c index f0ae2211..6c4213bd 100644 --- a/tests/clock-plugin/lttng-clock-plugin-test.c +++ b/tests/clock-plugin/lttng-clock-plugin-test.c @@ -10,8 +10,8 @@ #include #include -#include -#include /* From lttng-modules */ +#include +#include /* From lttng-modules */ static u64 trace_clock_read64_example(void) { diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c index 79743b80..ea273893 100644 --- a/tests/probes/lttng-test.c +++ b/tests/probes/lttng-test.c @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include #define TP_MODULE_NOAUTOLOAD diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c index 365b6e11..397624b5 100644 --- a/wrapper/irqdesc.c +++ b/wrapper/irqdesc.c @@ -9,7 +9,7 @@ * Copyright (C) 2011-2012 Mathieu Desnoyers */ -#include +#include #if (defined(CONFIG_KALLSYMS) \ && (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))) diff --git a/wrapper/mm.h b/wrapper/mm.h index e4bc4035..12b58be7 100644 --- a/wrapper/mm.h +++ b/wrapper/mm.h @@ -11,7 +11,7 @@ #include #include -#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) \ || LTTNG_UBUNTU_KERNEL_RANGE(4,4,25,44, 4,5,0,0)) diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c index 512e09f9..93504c99 100644 --- a/wrapper/page_alloc.c +++ b/wrapper/page_alloc.c @@ -9,7 +9,7 @@ * Copyright (C) 2015 Mathieu Desnoyers */ -#include +#include #if (defined(CONFIG_KALLSYMS) \ && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2) \ diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h index af9c0536..7669125a 100644 --- a/wrapper/page_alloc.h +++ b/wrapper/page_alloc.h @@ -12,7 +12,7 @@ #ifndef _LTTNG_WRAPPER_PAGE_ALLOC_H #define _LTTNG_WRAPPER_PAGE_ALLOC_H -#include +#include /* * We need to redefine get_pfnblock_flags_mask to our wrapper, because diff --git a/wrapper/random.h b/wrapper/random.h index 073a09a2..d438e1ba 100644 --- a/wrapper/random.h +++ b/wrapper/random.h @@ -10,7 +10,7 @@ #ifndef _LTTNG_WRAPPER_RANDOM_H #define _LTTNG_WRAPPER_RANDOM_H -#include +#include #define BOOT_ID_LEN LTTNG_MODULES_UUID_STR_LEN diff --git a/wrapper/splice.c b/wrapper/splice.c index 96fdf1d0..33e3aaa5 100644 --- a/wrapper/splice.c +++ b/wrapper/splice.c @@ -9,7 +9,7 @@ * Copyright (C) 2011-2012 Mathieu Desnoyers */ -#include +#include #if (defined(CONFIG_KALLSYMS) \ && (LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0))) diff --git a/wrapper/syscall.h b/wrapper/syscall.h index 671562b4..cecd800d 100644 --- a/wrapper/syscall.h +++ b/wrapper/syscall.h @@ -11,7 +11,7 @@ #define _LTTNG_WRAPPER_SYSCALL_H #include -#include +#include #define LTTNG_SYSCALL_NR_ARGS 6 diff --git a/wrapper/timer.h b/wrapper/timer.h index 02f60dce..76c8a572 100644 --- a/wrapper/timer.h +++ b/wrapper/timer.h @@ -12,7 +12,7 @@ #include #include -#include +#include /* * In the olden days, pinned timers were initialized normaly with init_timer() diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h index a08c6a8b..7cef08df 100644 --- a/wrapper/trace-clock.h +++ b/wrapper/trace-clock.h @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h index 7b319060..880638b9 100644 --- a/wrapper/tracepoint.h +++ b/wrapper/tracepoint.h @@ -23,7 +23,7 @@ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) -#include +#include #define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register #define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister diff --git a/wrapper/uaccess.h b/wrapper/uaccess.h index 7abe5e50..ffbc46a1 100644 --- a/wrapper/uaccess.h +++ b/wrapper/uaccess.h @@ -11,7 +11,7 @@ #define _LTTNG_WRAPPER_UACCESS_H #include -#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) || \ LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) diff --git a/wrapper/writeback.h b/wrapper/writeback.h index c37bd8be..e5f36c25 100644 --- a/wrapper/writeback.h +++ b/wrapper/writeback.h @@ -12,7 +12,7 @@ #ifndef _LTTNG_WRAPPER_WRITEBACK_H #define _LTTNG_WRAPPER_WRITEBACK_H -#include +#include #ifdef CONFIG_KALLSYMS_ALL #include -- 2.34.1