From cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 6 May 2020 14:08:22 -0400 Subject: [PATCH] Cleanup: Move all source files to src/ This includes *.c, lib/*/*.c, probes/*.c, wrapper/*.c. Adapt Makefile and Kbuild accordingly. Introduce src/Kbuild. Signed-off-by: Mathieu Desnoyers --- Makefile | 109 +---------------- src/Kbuild | 112 ++++++++++++++++++ {lib => src/lib}/Kbuild | 2 +- {lib => src/lib}/prio_heap/lttng_prio_heap.c | 0 .../lib}/ringbuffer/ring_buffer_backend.c | 0 .../lib}/ringbuffer/ring_buffer_frontend.c | 0 .../lib}/ringbuffer/ring_buffer_iterator.c | 0 .../lib}/ringbuffer/ring_buffer_mmap.c | 0 .../lib}/ringbuffer/ring_buffer_splice.c | 0 {lib => src/lib}/ringbuffer/ring_buffer_vfs.c | 0 lttng-abi.c => src/lttng-abi.c | 0 lttng-calibrate.c => src/lttng-calibrate.c | 0 lttng-clock.c => src/lttng-clock.c | 0 .../lttng-context-callstack-legacy-impl.h | 0 .../lttng-context-callstack-stackwalk-impl.h | 0 .../lttng-context-callstack.c | 0 .../lttng-context-cgroup-ns.c | 0 .../lttng-context-cpu-id.c | 0 .../lttng-context-egid.c | 0 .../lttng-context-euid.c | 0 .../lttng-context-gid.c | 0 .../lttng-context-hostname.c | 0 .../lttng-context-interruptible.c | 0 .../lttng-context-ipc-ns.c | 0 .../lttng-context-migratable.c | 0 .../lttng-context-mnt-ns.c | 0 .../lttng-context-need-reschedule.c | 0 .../lttng-context-net-ns.c | 0 .../lttng-context-nice.c | 0 .../lttng-context-perf-counters.c | 0 .../lttng-context-pid-ns.c | 0 .../lttng-context-pid.c | 0 .../lttng-context-ppid.c | 0 .../lttng-context-preemptible.c | 0 .../lttng-context-prio.c | 0 .../lttng-context-procname.c | 0 .../lttng-context-sgid.c | 0 .../lttng-context-suid.c | 0 .../lttng-context-tid.c | 0 .../lttng-context-uid.c | 0 .../lttng-context-user-ns.c | 0 .../lttng-context-uts-ns.c | 0 .../lttng-context-vegid.c | 0 .../lttng-context-veuid.c | 0 .../lttng-context-vgid.c | 0 .../lttng-context-vpid.c | 0 .../lttng-context-vppid.c | 0 .../lttng-context-vsgid.c | 0 .../lttng-context-vsuid.c | 0 .../lttng-context-vtid.c | 0 .../lttng-context-vuid.c | 0 lttng-context.c => src/lttng-context.c | 0 lttng-events.c => src/lttng-events.c | 0 .../lttng-filter-interpreter.c | 0 .../lttng-filter-specialize.c | 0 .../lttng-filter-validator.c | 0 lttng-filter.c => src/lttng-filter.c | 0 lttng-probes.c => src/lttng-probes.c | 0 .../lttng-ring-buffer-client-discard.c | 0 .../lttng-ring-buffer-client-mmap-discard.c | 0 .../lttng-ring-buffer-client-mmap-overwrite.c | 0 .../lttng-ring-buffer-client-overwrite.c | 0 .../lttng-ring-buffer-client.h | 0 .../lttng-ring-buffer-metadata-client.c | 0 .../lttng-ring-buffer-metadata-client.h | 0 .../lttng-ring-buffer-metadata-mmap-client.c | 0 .../lttng-statedump-impl.c | 0 .../lttng-string-utils.c | 0 lttng-syscalls.c => src/lttng-syscalls.c | 0 lttng-tp-mempool.c => src/lttng-tp-mempool.c | 0 lttng-tracepoint.c => src/lttng-tracepoint.c | 0 lttng-tracker-id.c => src/lttng-tracker-id.c | 0 .../lttng-wrapper-impl.c | 0 {probes => src/probes}/Kbuild | 2 +- {probes => src/probes}/lttng-kprobes.c | 0 {probes => src/probes}/lttng-kretprobes.c | 0 {probes => src/probes}/lttng-probe-9p.c | 0 {probes => src/probes}/lttng-probe-asoc.c | 0 {probes => src/probes}/lttng-probe-block.c | 0 {probes => src/probes}/lttng-probe-btrfs.c | 0 .../probes}/lttng-probe-compaction.c | 0 {probes => src/probes}/lttng-probe-ext3.c | 0 {probes => src/probes}/lttng-probe-ext4.c | 0 {probes => src/probes}/lttng-probe-gpio.c | 0 {probes => src/probes}/lttng-probe-i2c.c | 0 {probes => src/probes}/lttng-probe-irq.c | 0 {probes => src/probes}/lttng-probe-jbd.c | 0 {probes => src/probes}/lttng-probe-jbd2.c | 0 {probes => src/probes}/lttng-probe-kmem.c | 0 .../probes}/lttng-probe-kvm-x86-mmu.c | 0 {probes => src/probes}/lttng-probe-kvm-x86.c | 0 {probes => src/probes}/lttng-probe-kvm.c | 0 {probes => src/probes}/lttng-probe-lock.c | 0 {probes => src/probes}/lttng-probe-module.c | 0 {probes => src/probes}/lttng-probe-napi.c | 0 {probes => src/probes}/lttng-probe-net.c | 0 {probes => src/probes}/lttng-probe-power.c | 0 .../probes}/lttng-probe-preemptirq.c | 0 {probes => src/probes}/lttng-probe-printk.c | 0 {probes => src/probes}/lttng-probe-random.c | 0 {probes => src/probes}/lttng-probe-rcu.c | 0 {probes => src/probes}/lttng-probe-regmap.c | 0 .../probes}/lttng-probe-regulator.c | 0 {probes => src/probes}/lttng-probe-rpm.c | 0 {probes => src/probes}/lttng-probe-sched.c | 0 {probes => src/probes}/lttng-probe-scsi.c | 0 {probes => src/probes}/lttng-probe-signal.c | 0 {probes => src/probes}/lttng-probe-skb.c | 0 {probes => src/probes}/lttng-probe-sock.c | 0 .../probes}/lttng-probe-statedump.c | 0 {probes => src/probes}/lttng-probe-sunrpc.c | 0 {probes => src/probes}/lttng-probe-timer.c | 0 {probes => src/probes}/lttng-probe-udp.c | 0 {probes => src/probes}/lttng-probe-user.c | 0 {probes => src/probes}/lttng-probe-v4l2.c | 0 {probes => src/probes}/lttng-probe-vmscan.c | 0 .../probes}/lttng-probe-workqueue.c | 0 .../probes}/lttng-probe-writeback.c | 0 .../probes}/lttng-probe-x86-exceptions.c | 0 .../probes}/lttng-probe-x86-irq-vectors.c | 0 {probes => src/probes}/lttng-uprobes.c | 0 {probes => src/probes}/lttng.c | 0 {wrapper => src/wrapper}/fdtable.c | 0 {wrapper => src/wrapper}/irqdesc.c | 0 {wrapper => src/wrapper}/kallsyms.c | 0 {wrapper => src/wrapper}/page_alloc.c | 0 {wrapper => src/wrapper}/random.c | 0 {wrapper => src/wrapper}/splice.c | 0 {wrapper => src/wrapper}/trace-clock.c | 0 129 files changed, 115 insertions(+), 110 deletions(-) create mode 100644 src/Kbuild rename {lib => src/lib}/Kbuild (97%) rename {lib => src/lib}/prio_heap/lttng_prio_heap.c (100%) rename {lib => src/lib}/ringbuffer/ring_buffer_backend.c (100%) rename {lib => src/lib}/ringbuffer/ring_buffer_frontend.c (100%) rename {lib => src/lib}/ringbuffer/ring_buffer_iterator.c (100%) rename {lib => src/lib}/ringbuffer/ring_buffer_mmap.c (100%) rename {lib => src/lib}/ringbuffer/ring_buffer_splice.c (100%) rename {lib => src/lib}/ringbuffer/ring_buffer_vfs.c (100%) rename lttng-abi.c => src/lttng-abi.c (100%) rename lttng-calibrate.c => src/lttng-calibrate.c (100%) rename lttng-clock.c => src/lttng-clock.c (100%) rename lttng-context-callstack-legacy-impl.h => src/lttng-context-callstack-legacy-impl.h (100%) rename lttng-context-callstack-stackwalk-impl.h => src/lttng-context-callstack-stackwalk-impl.h (100%) rename lttng-context-callstack.c => src/lttng-context-callstack.c (100%) rename lttng-context-cgroup-ns.c => src/lttng-context-cgroup-ns.c (100%) rename lttng-context-cpu-id.c => src/lttng-context-cpu-id.c (100%) rename lttng-context-egid.c => src/lttng-context-egid.c (100%) rename lttng-context-euid.c => src/lttng-context-euid.c (100%) rename lttng-context-gid.c => src/lttng-context-gid.c (100%) rename lttng-context-hostname.c => src/lttng-context-hostname.c (100%) rename lttng-context-interruptible.c => src/lttng-context-interruptible.c (100%) rename lttng-context-ipc-ns.c => src/lttng-context-ipc-ns.c (100%) rename lttng-context-migratable.c => src/lttng-context-migratable.c (100%) rename lttng-context-mnt-ns.c => src/lttng-context-mnt-ns.c (100%) rename lttng-context-need-reschedule.c => src/lttng-context-need-reschedule.c (100%) rename lttng-context-net-ns.c => src/lttng-context-net-ns.c (100%) rename lttng-context-nice.c => src/lttng-context-nice.c (100%) rename lttng-context-perf-counters.c => src/lttng-context-perf-counters.c (100%) rename lttng-context-pid-ns.c => src/lttng-context-pid-ns.c (100%) rename lttng-context-pid.c => src/lttng-context-pid.c (100%) rename lttng-context-ppid.c => src/lttng-context-ppid.c (100%) rename lttng-context-preemptible.c => src/lttng-context-preemptible.c (100%) rename lttng-context-prio.c => src/lttng-context-prio.c (100%) rename lttng-context-procname.c => src/lttng-context-procname.c (100%) rename lttng-context-sgid.c => src/lttng-context-sgid.c (100%) rename lttng-context-suid.c => src/lttng-context-suid.c (100%) rename lttng-context-tid.c => src/lttng-context-tid.c (100%) rename lttng-context-uid.c => src/lttng-context-uid.c (100%) rename lttng-context-user-ns.c => src/lttng-context-user-ns.c (100%) rename lttng-context-uts-ns.c => src/lttng-context-uts-ns.c (100%) rename lttng-context-vegid.c => src/lttng-context-vegid.c (100%) rename lttng-context-veuid.c => src/lttng-context-veuid.c (100%) rename lttng-context-vgid.c => src/lttng-context-vgid.c (100%) rename lttng-context-vpid.c => src/lttng-context-vpid.c (100%) rename lttng-context-vppid.c => src/lttng-context-vppid.c (100%) rename lttng-context-vsgid.c => src/lttng-context-vsgid.c (100%) rename lttng-context-vsuid.c => src/lttng-context-vsuid.c (100%) rename lttng-context-vtid.c => src/lttng-context-vtid.c (100%) rename lttng-context-vuid.c => src/lttng-context-vuid.c (100%) rename lttng-context.c => src/lttng-context.c (100%) rename lttng-events.c => src/lttng-events.c (100%) rename lttng-filter-interpreter.c => src/lttng-filter-interpreter.c (100%) rename lttng-filter-specialize.c => src/lttng-filter-specialize.c (100%) rename lttng-filter-validator.c => src/lttng-filter-validator.c (100%) rename lttng-filter.c => src/lttng-filter.c (100%) rename lttng-probes.c => src/lttng-probes.c (100%) rename lttng-ring-buffer-client-discard.c => src/lttng-ring-buffer-client-discard.c (100%) rename lttng-ring-buffer-client-mmap-discard.c => src/lttng-ring-buffer-client-mmap-discard.c (100%) rename lttng-ring-buffer-client-mmap-overwrite.c => src/lttng-ring-buffer-client-mmap-overwrite.c (100%) rename lttng-ring-buffer-client-overwrite.c => src/lttng-ring-buffer-client-overwrite.c (100%) rename lttng-ring-buffer-client.h => src/lttng-ring-buffer-client.h (100%) rename lttng-ring-buffer-metadata-client.c => src/lttng-ring-buffer-metadata-client.c (100%) rename lttng-ring-buffer-metadata-client.h => src/lttng-ring-buffer-metadata-client.h (100%) rename lttng-ring-buffer-metadata-mmap-client.c => src/lttng-ring-buffer-metadata-mmap-client.c (100%) rename lttng-statedump-impl.c => src/lttng-statedump-impl.c (100%) rename lttng-string-utils.c => src/lttng-string-utils.c (100%) rename lttng-syscalls.c => src/lttng-syscalls.c (100%) rename lttng-tp-mempool.c => src/lttng-tp-mempool.c (100%) rename lttng-tracepoint.c => src/lttng-tracepoint.c (100%) rename lttng-tracker-id.c => src/lttng-tracker-id.c (100%) rename lttng-wrapper-impl.c => src/lttng-wrapper-impl.c (100%) rename {probes => src/probes}/Kbuild (99%) rename {probes => src/probes}/lttng-kprobes.c (100%) rename {probes => src/probes}/lttng-kretprobes.c (100%) rename {probes => src/probes}/lttng-probe-9p.c (100%) rename {probes => src/probes}/lttng-probe-asoc.c (100%) rename {probes => src/probes}/lttng-probe-block.c (100%) rename {probes => src/probes}/lttng-probe-btrfs.c (100%) rename {probes => src/probes}/lttng-probe-compaction.c (100%) rename {probes => src/probes}/lttng-probe-ext3.c (100%) rename {probes => src/probes}/lttng-probe-ext4.c (100%) rename {probes => src/probes}/lttng-probe-gpio.c (100%) rename {probes => src/probes}/lttng-probe-i2c.c (100%) rename {probes => src/probes}/lttng-probe-irq.c (100%) rename {probes => src/probes}/lttng-probe-jbd.c (100%) rename {probes => src/probes}/lttng-probe-jbd2.c (100%) rename {probes => src/probes}/lttng-probe-kmem.c (100%) rename {probes => src/probes}/lttng-probe-kvm-x86-mmu.c (100%) rename {probes => src/probes}/lttng-probe-kvm-x86.c (100%) rename {probes => src/probes}/lttng-probe-kvm.c (100%) rename {probes => src/probes}/lttng-probe-lock.c (100%) rename {probes => src/probes}/lttng-probe-module.c (100%) rename {probes => src/probes}/lttng-probe-napi.c (100%) rename {probes => src/probes}/lttng-probe-net.c (100%) rename {probes => src/probes}/lttng-probe-power.c (100%) rename {probes => src/probes}/lttng-probe-preemptirq.c (100%) rename {probes => src/probes}/lttng-probe-printk.c (100%) rename {probes => src/probes}/lttng-probe-random.c (100%) rename {probes => src/probes}/lttng-probe-rcu.c (100%) rename {probes => src/probes}/lttng-probe-regmap.c (100%) rename {probes => src/probes}/lttng-probe-regulator.c (100%) rename {probes => src/probes}/lttng-probe-rpm.c (100%) rename {probes => src/probes}/lttng-probe-sched.c (100%) rename {probes => src/probes}/lttng-probe-scsi.c (100%) rename {probes => src/probes}/lttng-probe-signal.c (100%) rename {probes => src/probes}/lttng-probe-skb.c (100%) rename {probes => src/probes}/lttng-probe-sock.c (100%) rename {probes => src/probes}/lttng-probe-statedump.c (100%) rename {probes => src/probes}/lttng-probe-sunrpc.c (100%) rename {probes => src/probes}/lttng-probe-timer.c (100%) rename {probes => src/probes}/lttng-probe-udp.c (100%) rename {probes => src/probes}/lttng-probe-user.c (100%) rename {probes => src/probes}/lttng-probe-v4l2.c (100%) rename {probes => src/probes}/lttng-probe-vmscan.c (100%) rename {probes => src/probes}/lttng-probe-workqueue.c (100%) rename {probes => src/probes}/lttng-probe-writeback.c (100%) rename {probes => src/probes}/lttng-probe-x86-exceptions.c (100%) rename {probes => src/probes}/lttng-probe-x86-irq-vectors.c (100%) rename {probes => src/probes}/lttng-uprobes.c (100%) rename {probes => src/probes}/lttng.c (100%) rename {wrapper => src/wrapper}/fdtable.c (100%) rename {wrapper => src/wrapper}/irqdesc.c (100%) rename {wrapper => src/wrapper}/kallsyms.c (100%) rename {wrapper => src/wrapper}/page_alloc.c (100%) rename {wrapper => src/wrapper}/random.c (100%) rename {wrapper => src/wrapper}/splice.c (100%) rename {wrapper => src/wrapper}/trace-clock.c (100%) diff --git a/Makefile b/Makefile index 7ee341e1..c586efed 100644 --- a/Makefile +++ b/Makefile @@ -27,114 +27,7 @@ ifneq ($(KERNELRELEASE),) endif endif - include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common - - ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include - - obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o - obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o - obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-client.o - obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-discard.o - obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-overwrite.o - obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-mmap-client.o - obj-$(CONFIG_LTTNG) += lttng-clock.o - - obj-$(CONFIG_LTTNG) += lttng-tracer.o - - obj-$(CONFIG_LTTNG) += lttng-wrapper.o - - lttng-tracer-objs := lttng-events.o lttng-abi.o lttng-string-utils.o \ - lttng-probes.o lttng-context.o \ - lttng-context-pid.o lttng-context-procname.o \ - lttng-context-prio.o lttng-context-nice.o \ - lttng-context-vpid.o lttng-context-tid.o \ - lttng-context-vtid.o lttng-context-ppid.o \ - lttng-context-vppid.o lttng-context-cpu-id.o \ - lttng-context-uid.o \ - lttng-context-euid.o \ - lttng-context-suid.o \ - lttng-context-gid.o \ - lttng-context-egid.o \ - lttng-context-sgid.o \ - lttng-context-vuid.o \ - lttng-context-veuid.o \ - lttng-context-vsuid.o \ - lttng-context-vgid.o \ - lttng-context-vegid.o \ - lttng-context-vsgid.o \ - lttng-context-interruptible.o \ - lttng-context-need-reschedule.o \ - lttng-context-callstack.o lttng-calibrate.o \ - lttng-context-hostname.o \ - probes/lttng.o \ - lttng-tracker-id.o \ - lttng-filter.o lttng-filter-interpreter.o \ - lttng-filter-specialize.o \ - lttng-filter-validator.o \ - probes/lttng-probe-user.o \ - lttng-tp-mempool.o \ - - lttng-wrapper-objs := wrapper/page_alloc.o \ - wrapper/random.o \ - wrapper/trace-clock.o \ - wrapper/kallsyms.o \ - wrapper/irqdesc.o \ - wrapper/fdtable.o \ - lttng-wrapper-impl.o - - ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),) - lttng-tracer-objs += lttng-syscalls.o - endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS - - ifneq ($(CONFIG_PERF_EVENTS),) - lttng-tracer-objs += lttng-context-perf-counters.o - endif # CONFIG_PERF_EVENTS - - ifneq ($(CONFIG_PREEMPT_RT_FULL),) - lttng-tracer-objs += lttng-context-migratable.o - lttng-tracer-objs += lttng-context-preemptible.o - endif # CONFIG_PREEMPT_RT_FULL - - ifneq ($(CONFIG_PREEMPT),) - lttng-tracer-objs += lttng-context-preemptible.o - endif - - lttng-tracer-objs += $(shell \ - if [ $(VERSION) -ge 4 \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 \) ] ; then \ - echo "lttng-tracepoint.o" ; fi;) - - lttng-tracer-objs += lttng-context-cgroup-ns.o - - ifneq ($(CONFIG_IPC_NS),) - lttng-tracer-objs += lttng-context-ipc-ns.o - endif - - ifneq ($(wildcard $(mnt_ns_dep)),) - lttng-tracer-objs += lttng-context-mnt-ns.o - endif - - ifneq ($(CONFIG_NET_NS),) - lttng-tracer-objs += lttng-context-net-ns.o - endif - - ifneq ($(CONFIG_PID_NS),) - lttng-tracer-objs += lttng-context-pid-ns.o - endif - - ifneq ($(CONFIG_USER_NS),) - lttng-tracer-objs += lttng-context-user-ns.o - endif - - ifneq ($(CONFIG_UTS_NS),) - lttng-tracer-objs += lttng-context-uts-ns.o - endif - - obj-$(CONFIG_LTTNG) += lttng-statedump.o - lttng-statedump-objs := lttng-statedump-impl.o - - obj-$(CONFIG_LTTNG) += probes/ - obj-$(CONFIG_LTTNG) += lib/ + obj-$(CONFIG_LTTNG) += src/ obj-$(CONFIG_LTTNG) += tests/ else # KERNELRELEASE diff --git a/src/Kbuild b/src/Kbuild new file mode 100644 index 00000000..fad44601 --- /dev/null +++ b/src/Kbuild @@ -0,0 +1,112 @@ +# SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) + +TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. + +include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common + +ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include + +obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o +obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o +obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-client.o +obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-discard.o +obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-overwrite.o +obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-mmap-client.o +obj-$(CONFIG_LTTNG) += lttng-clock.o + +obj-$(CONFIG_LTTNG) += lttng-tracer.o + +obj-$(CONFIG_LTTNG) += lttng-wrapper.o + +lttng-tracer-objs := lttng-events.o lttng-abi.o lttng-string-utils.o \ + lttng-probes.o lttng-context.o \ + lttng-context-pid.o lttng-context-procname.o \ + lttng-context-prio.o lttng-context-nice.o \ + lttng-context-vpid.o lttng-context-tid.o \ + lttng-context-vtid.o lttng-context-ppid.o \ + lttng-context-vppid.o lttng-context-cpu-id.o \ + lttng-context-uid.o \ + lttng-context-euid.o \ + lttng-context-suid.o \ + lttng-context-gid.o \ + lttng-context-egid.o \ + lttng-context-sgid.o \ + lttng-context-vuid.o \ + lttng-context-veuid.o \ + lttng-context-vsuid.o \ + lttng-context-vgid.o \ + lttng-context-vegid.o \ + lttng-context-vsgid.o \ + lttng-context-interruptible.o \ + lttng-context-need-reschedule.o \ + lttng-context-callstack.o lttng-calibrate.o \ + lttng-context-hostname.o \ + probes/lttng.o \ + lttng-tracker-id.o \ + lttng-filter.o lttng-filter-interpreter.o \ + lttng-filter-specialize.o \ + lttng-filter-validator.o \ + probes/lttng-probe-user.o \ + lttng-tp-mempool.o \ + +lttng-wrapper-objs := wrapper/page_alloc.o \ + wrapper/random.o \ + wrapper/trace-clock.o \ + wrapper/kallsyms.o \ + wrapper/irqdesc.o \ + wrapper/fdtable.o \ + lttng-wrapper-impl.o + +ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),) + lttng-tracer-objs += lttng-syscalls.o +endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS + +ifneq ($(CONFIG_PERF_EVENTS),) + lttng-tracer-objs += lttng-context-perf-counters.o +endif # CONFIG_PERF_EVENTS + +ifneq ($(CONFIG_PREEMPT_RT_FULL),) + lttng-tracer-objs += lttng-context-migratable.o + lttng-tracer-objs += lttng-context-preemptible.o +endif # CONFIG_PREEMPT_RT_FULL + +ifneq ($(CONFIG_PREEMPT),) + lttng-tracer-objs += lttng-context-preemptible.o +endif + +lttng-tracer-objs += $(shell \ + if [ $(VERSION) -ge 4 \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 \) ] ; then \ + echo "lttng-tracepoint.o" ; fi;) + +lttng-tracer-objs += lttng-context-cgroup-ns.o + +ifneq ($(CONFIG_IPC_NS),) + lttng-tracer-objs += lttng-context-ipc-ns.o +endif + +ifneq ($(wildcard $(mnt_ns_dep)),) + lttng-tracer-objs += lttng-context-mnt-ns.o +endif + +ifneq ($(CONFIG_NET_NS),) + lttng-tracer-objs += lttng-context-net-ns.o +endif + +ifneq ($(CONFIG_PID_NS),) + lttng-tracer-objs += lttng-context-pid-ns.o +endif + +ifneq ($(CONFIG_USER_NS),) + lttng-tracer-objs += lttng-context-user-ns.o +endif + +ifneq ($(CONFIG_UTS_NS),) + lttng-tracer-objs += lttng-context-uts-ns.o +endif + +obj-$(CONFIG_LTTNG) += lttng-statedump.o +lttng-statedump-objs := lttng-statedump-impl.o + +obj-$(CONFIG_LTTNG) += probes/ +obj-$(CONFIG_LTTNG) += lib/ diff --git a/lib/Kbuild b/src/lib/Kbuild similarity index 97% rename from lib/Kbuild rename to src/lib/Kbuild index a2837b46..82049e9d 100644 --- a/lib/Kbuild +++ b/src/lib/Kbuild @@ -1,6 +1,6 @@ # SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) -TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. +TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/../.. include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common diff --git a/lib/prio_heap/lttng_prio_heap.c b/src/lib/prio_heap/lttng_prio_heap.c similarity index 100% rename from lib/prio_heap/lttng_prio_heap.c rename to src/lib/prio_heap/lttng_prio_heap.c diff --git a/lib/ringbuffer/ring_buffer_backend.c b/src/lib/ringbuffer/ring_buffer_backend.c similarity index 100% rename from lib/ringbuffer/ring_buffer_backend.c rename to src/lib/ringbuffer/ring_buffer_backend.c diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/src/lib/ringbuffer/ring_buffer_frontend.c similarity index 100% rename from lib/ringbuffer/ring_buffer_frontend.c rename to src/lib/ringbuffer/ring_buffer_frontend.c diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/src/lib/ringbuffer/ring_buffer_iterator.c similarity index 100% rename from lib/ringbuffer/ring_buffer_iterator.c rename to src/lib/ringbuffer/ring_buffer_iterator.c diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/src/lib/ringbuffer/ring_buffer_mmap.c similarity index 100% rename from lib/ringbuffer/ring_buffer_mmap.c rename to src/lib/ringbuffer/ring_buffer_mmap.c diff --git a/lib/ringbuffer/ring_buffer_splice.c b/src/lib/ringbuffer/ring_buffer_splice.c similarity index 100% rename from lib/ringbuffer/ring_buffer_splice.c rename to src/lib/ringbuffer/ring_buffer_splice.c diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/src/lib/ringbuffer/ring_buffer_vfs.c similarity index 100% rename from lib/ringbuffer/ring_buffer_vfs.c rename to src/lib/ringbuffer/ring_buffer_vfs.c diff --git a/lttng-abi.c b/src/lttng-abi.c similarity index 100% rename from lttng-abi.c rename to src/lttng-abi.c diff --git a/lttng-calibrate.c b/src/lttng-calibrate.c similarity index 100% rename from lttng-calibrate.c rename to src/lttng-calibrate.c diff --git a/lttng-clock.c b/src/lttng-clock.c similarity index 100% rename from lttng-clock.c rename to src/lttng-clock.c diff --git a/lttng-context-callstack-legacy-impl.h b/src/lttng-context-callstack-legacy-impl.h similarity index 100% rename from lttng-context-callstack-legacy-impl.h rename to src/lttng-context-callstack-legacy-impl.h diff --git a/lttng-context-callstack-stackwalk-impl.h b/src/lttng-context-callstack-stackwalk-impl.h similarity index 100% rename from lttng-context-callstack-stackwalk-impl.h rename to src/lttng-context-callstack-stackwalk-impl.h diff --git a/lttng-context-callstack.c b/src/lttng-context-callstack.c similarity index 100% rename from lttng-context-callstack.c rename to src/lttng-context-callstack.c diff --git a/lttng-context-cgroup-ns.c b/src/lttng-context-cgroup-ns.c similarity index 100% rename from lttng-context-cgroup-ns.c rename to src/lttng-context-cgroup-ns.c diff --git a/lttng-context-cpu-id.c b/src/lttng-context-cpu-id.c similarity index 100% rename from lttng-context-cpu-id.c rename to src/lttng-context-cpu-id.c diff --git a/lttng-context-egid.c b/src/lttng-context-egid.c similarity index 100% rename from lttng-context-egid.c rename to src/lttng-context-egid.c diff --git a/lttng-context-euid.c b/src/lttng-context-euid.c similarity index 100% rename from lttng-context-euid.c rename to src/lttng-context-euid.c diff --git a/lttng-context-gid.c b/src/lttng-context-gid.c similarity index 100% rename from lttng-context-gid.c rename to src/lttng-context-gid.c diff --git a/lttng-context-hostname.c b/src/lttng-context-hostname.c similarity index 100% rename from lttng-context-hostname.c rename to src/lttng-context-hostname.c diff --git a/lttng-context-interruptible.c b/src/lttng-context-interruptible.c similarity index 100% rename from lttng-context-interruptible.c rename to src/lttng-context-interruptible.c diff --git a/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c similarity index 100% rename from lttng-context-ipc-ns.c rename to src/lttng-context-ipc-ns.c diff --git a/lttng-context-migratable.c b/src/lttng-context-migratable.c similarity index 100% rename from lttng-context-migratable.c rename to src/lttng-context-migratable.c diff --git a/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c similarity index 100% rename from lttng-context-mnt-ns.c rename to src/lttng-context-mnt-ns.c diff --git a/lttng-context-need-reschedule.c b/src/lttng-context-need-reschedule.c similarity index 100% rename from lttng-context-need-reschedule.c rename to src/lttng-context-need-reschedule.c diff --git a/lttng-context-net-ns.c b/src/lttng-context-net-ns.c similarity index 100% rename from lttng-context-net-ns.c rename to src/lttng-context-net-ns.c diff --git a/lttng-context-nice.c b/src/lttng-context-nice.c similarity index 100% rename from lttng-context-nice.c rename to src/lttng-context-nice.c diff --git a/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c similarity index 100% rename from lttng-context-perf-counters.c rename to src/lttng-context-perf-counters.c diff --git a/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c similarity index 100% rename from lttng-context-pid-ns.c rename to src/lttng-context-pid-ns.c diff --git a/lttng-context-pid.c b/src/lttng-context-pid.c similarity index 100% rename from lttng-context-pid.c rename to src/lttng-context-pid.c diff --git a/lttng-context-ppid.c b/src/lttng-context-ppid.c similarity index 100% rename from lttng-context-ppid.c rename to src/lttng-context-ppid.c diff --git a/lttng-context-preemptible.c b/src/lttng-context-preemptible.c similarity index 100% rename from lttng-context-preemptible.c rename to src/lttng-context-preemptible.c diff --git a/lttng-context-prio.c b/src/lttng-context-prio.c similarity index 100% rename from lttng-context-prio.c rename to src/lttng-context-prio.c diff --git a/lttng-context-procname.c b/src/lttng-context-procname.c similarity index 100% rename from lttng-context-procname.c rename to src/lttng-context-procname.c diff --git a/lttng-context-sgid.c b/src/lttng-context-sgid.c similarity index 100% rename from lttng-context-sgid.c rename to src/lttng-context-sgid.c diff --git a/lttng-context-suid.c b/src/lttng-context-suid.c similarity index 100% rename from lttng-context-suid.c rename to src/lttng-context-suid.c diff --git a/lttng-context-tid.c b/src/lttng-context-tid.c similarity index 100% rename from lttng-context-tid.c rename to src/lttng-context-tid.c diff --git a/lttng-context-uid.c b/src/lttng-context-uid.c similarity index 100% rename from lttng-context-uid.c rename to src/lttng-context-uid.c diff --git a/lttng-context-user-ns.c b/src/lttng-context-user-ns.c similarity index 100% rename from lttng-context-user-ns.c rename to src/lttng-context-user-ns.c diff --git a/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c similarity index 100% rename from lttng-context-uts-ns.c rename to src/lttng-context-uts-ns.c diff --git a/lttng-context-vegid.c b/src/lttng-context-vegid.c similarity index 100% rename from lttng-context-vegid.c rename to src/lttng-context-vegid.c diff --git a/lttng-context-veuid.c b/src/lttng-context-veuid.c similarity index 100% rename from lttng-context-veuid.c rename to src/lttng-context-veuid.c diff --git a/lttng-context-vgid.c b/src/lttng-context-vgid.c similarity index 100% rename from lttng-context-vgid.c rename to src/lttng-context-vgid.c diff --git a/lttng-context-vpid.c b/src/lttng-context-vpid.c similarity index 100% rename from lttng-context-vpid.c rename to src/lttng-context-vpid.c diff --git a/lttng-context-vppid.c b/src/lttng-context-vppid.c similarity index 100% rename from lttng-context-vppid.c rename to src/lttng-context-vppid.c diff --git a/lttng-context-vsgid.c b/src/lttng-context-vsgid.c similarity index 100% rename from lttng-context-vsgid.c rename to src/lttng-context-vsgid.c diff --git a/lttng-context-vsuid.c b/src/lttng-context-vsuid.c similarity index 100% rename from lttng-context-vsuid.c rename to src/lttng-context-vsuid.c diff --git a/lttng-context-vtid.c b/src/lttng-context-vtid.c similarity index 100% rename from lttng-context-vtid.c rename to src/lttng-context-vtid.c diff --git a/lttng-context-vuid.c b/src/lttng-context-vuid.c similarity index 100% rename from lttng-context-vuid.c rename to src/lttng-context-vuid.c diff --git a/lttng-context.c b/src/lttng-context.c similarity index 100% rename from lttng-context.c rename to src/lttng-context.c diff --git a/lttng-events.c b/src/lttng-events.c similarity index 100% rename from lttng-events.c rename to src/lttng-events.c diff --git a/lttng-filter-interpreter.c b/src/lttng-filter-interpreter.c similarity index 100% rename from lttng-filter-interpreter.c rename to src/lttng-filter-interpreter.c diff --git a/lttng-filter-specialize.c b/src/lttng-filter-specialize.c similarity index 100% rename from lttng-filter-specialize.c rename to src/lttng-filter-specialize.c diff --git a/lttng-filter-validator.c b/src/lttng-filter-validator.c similarity index 100% rename from lttng-filter-validator.c rename to src/lttng-filter-validator.c diff --git a/lttng-filter.c b/src/lttng-filter.c similarity index 100% rename from lttng-filter.c rename to src/lttng-filter.c diff --git a/lttng-probes.c b/src/lttng-probes.c similarity index 100% rename from lttng-probes.c rename to src/lttng-probes.c diff --git a/lttng-ring-buffer-client-discard.c b/src/lttng-ring-buffer-client-discard.c similarity index 100% rename from lttng-ring-buffer-client-discard.c rename to src/lttng-ring-buffer-client-discard.c diff --git a/lttng-ring-buffer-client-mmap-discard.c b/src/lttng-ring-buffer-client-mmap-discard.c similarity index 100% rename from lttng-ring-buffer-client-mmap-discard.c rename to src/lttng-ring-buffer-client-mmap-discard.c diff --git a/lttng-ring-buffer-client-mmap-overwrite.c b/src/lttng-ring-buffer-client-mmap-overwrite.c similarity index 100% rename from lttng-ring-buffer-client-mmap-overwrite.c rename to src/lttng-ring-buffer-client-mmap-overwrite.c diff --git a/lttng-ring-buffer-client-overwrite.c b/src/lttng-ring-buffer-client-overwrite.c similarity index 100% rename from lttng-ring-buffer-client-overwrite.c rename to src/lttng-ring-buffer-client-overwrite.c diff --git a/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h similarity index 100% rename from lttng-ring-buffer-client.h rename to src/lttng-ring-buffer-client.h diff --git a/lttng-ring-buffer-metadata-client.c b/src/lttng-ring-buffer-metadata-client.c similarity index 100% rename from lttng-ring-buffer-metadata-client.c rename to src/lttng-ring-buffer-metadata-client.c diff --git a/lttng-ring-buffer-metadata-client.h b/src/lttng-ring-buffer-metadata-client.h similarity index 100% rename from lttng-ring-buffer-metadata-client.h rename to src/lttng-ring-buffer-metadata-client.h diff --git a/lttng-ring-buffer-metadata-mmap-client.c b/src/lttng-ring-buffer-metadata-mmap-client.c similarity index 100% rename from lttng-ring-buffer-metadata-mmap-client.c rename to src/lttng-ring-buffer-metadata-mmap-client.c diff --git a/lttng-statedump-impl.c b/src/lttng-statedump-impl.c similarity index 100% rename from lttng-statedump-impl.c rename to src/lttng-statedump-impl.c diff --git a/lttng-string-utils.c b/src/lttng-string-utils.c similarity index 100% rename from lttng-string-utils.c rename to src/lttng-string-utils.c diff --git a/lttng-syscalls.c b/src/lttng-syscalls.c similarity index 100% rename from lttng-syscalls.c rename to src/lttng-syscalls.c diff --git a/lttng-tp-mempool.c b/src/lttng-tp-mempool.c similarity index 100% rename from lttng-tp-mempool.c rename to src/lttng-tp-mempool.c diff --git a/lttng-tracepoint.c b/src/lttng-tracepoint.c similarity index 100% rename from lttng-tracepoint.c rename to src/lttng-tracepoint.c diff --git a/lttng-tracker-id.c b/src/lttng-tracker-id.c similarity index 100% rename from lttng-tracker-id.c rename to src/lttng-tracker-id.c diff --git a/lttng-wrapper-impl.c b/src/lttng-wrapper-impl.c similarity index 100% rename from lttng-wrapper-impl.c rename to src/lttng-wrapper-impl.c diff --git a/probes/Kbuild b/src/probes/Kbuild similarity index 99% rename from probes/Kbuild rename to src/probes/Kbuild index 9c53ca27..0fc7e9c2 100644 --- a/probes/Kbuild +++ b/src/probes/Kbuild @@ -1,6 +1,6 @@ # SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) -TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. +TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/../.. include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common diff --git a/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c similarity index 100% rename from probes/lttng-kprobes.c rename to src/probes/lttng-kprobes.c diff --git a/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c similarity index 100% rename from probes/lttng-kretprobes.c rename to src/probes/lttng-kretprobes.c diff --git a/probes/lttng-probe-9p.c b/src/probes/lttng-probe-9p.c similarity index 100% rename from probes/lttng-probe-9p.c rename to src/probes/lttng-probe-9p.c diff --git a/probes/lttng-probe-asoc.c b/src/probes/lttng-probe-asoc.c similarity index 100% rename from probes/lttng-probe-asoc.c rename to src/probes/lttng-probe-asoc.c diff --git a/probes/lttng-probe-block.c b/src/probes/lttng-probe-block.c similarity index 100% rename from probes/lttng-probe-block.c rename to src/probes/lttng-probe-block.c diff --git a/probes/lttng-probe-btrfs.c b/src/probes/lttng-probe-btrfs.c similarity index 100% rename from probes/lttng-probe-btrfs.c rename to src/probes/lttng-probe-btrfs.c diff --git a/probes/lttng-probe-compaction.c b/src/probes/lttng-probe-compaction.c similarity index 100% rename from probes/lttng-probe-compaction.c rename to src/probes/lttng-probe-compaction.c diff --git a/probes/lttng-probe-ext3.c b/src/probes/lttng-probe-ext3.c similarity index 100% rename from probes/lttng-probe-ext3.c rename to src/probes/lttng-probe-ext3.c diff --git a/probes/lttng-probe-ext4.c b/src/probes/lttng-probe-ext4.c similarity index 100% rename from probes/lttng-probe-ext4.c rename to src/probes/lttng-probe-ext4.c diff --git a/probes/lttng-probe-gpio.c b/src/probes/lttng-probe-gpio.c similarity index 100% rename from probes/lttng-probe-gpio.c rename to src/probes/lttng-probe-gpio.c diff --git a/probes/lttng-probe-i2c.c b/src/probes/lttng-probe-i2c.c similarity index 100% rename from probes/lttng-probe-i2c.c rename to src/probes/lttng-probe-i2c.c diff --git a/probes/lttng-probe-irq.c b/src/probes/lttng-probe-irq.c similarity index 100% rename from probes/lttng-probe-irq.c rename to src/probes/lttng-probe-irq.c diff --git a/probes/lttng-probe-jbd.c b/src/probes/lttng-probe-jbd.c similarity index 100% rename from probes/lttng-probe-jbd.c rename to src/probes/lttng-probe-jbd.c diff --git a/probes/lttng-probe-jbd2.c b/src/probes/lttng-probe-jbd2.c similarity index 100% rename from probes/lttng-probe-jbd2.c rename to src/probes/lttng-probe-jbd2.c diff --git a/probes/lttng-probe-kmem.c b/src/probes/lttng-probe-kmem.c similarity index 100% rename from probes/lttng-probe-kmem.c rename to src/probes/lttng-probe-kmem.c diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/src/probes/lttng-probe-kvm-x86-mmu.c similarity index 100% rename from probes/lttng-probe-kvm-x86-mmu.c rename to src/probes/lttng-probe-kvm-x86-mmu.c diff --git a/probes/lttng-probe-kvm-x86.c b/src/probes/lttng-probe-kvm-x86.c similarity index 100% rename from probes/lttng-probe-kvm-x86.c rename to src/probes/lttng-probe-kvm-x86.c diff --git a/probes/lttng-probe-kvm.c b/src/probes/lttng-probe-kvm.c similarity index 100% rename from probes/lttng-probe-kvm.c rename to src/probes/lttng-probe-kvm.c diff --git a/probes/lttng-probe-lock.c b/src/probes/lttng-probe-lock.c similarity index 100% rename from probes/lttng-probe-lock.c rename to src/probes/lttng-probe-lock.c diff --git a/probes/lttng-probe-module.c b/src/probes/lttng-probe-module.c similarity index 100% rename from probes/lttng-probe-module.c rename to src/probes/lttng-probe-module.c diff --git a/probes/lttng-probe-napi.c b/src/probes/lttng-probe-napi.c similarity index 100% rename from probes/lttng-probe-napi.c rename to src/probes/lttng-probe-napi.c diff --git a/probes/lttng-probe-net.c b/src/probes/lttng-probe-net.c similarity index 100% rename from probes/lttng-probe-net.c rename to src/probes/lttng-probe-net.c diff --git a/probes/lttng-probe-power.c b/src/probes/lttng-probe-power.c similarity index 100% rename from probes/lttng-probe-power.c rename to src/probes/lttng-probe-power.c diff --git a/probes/lttng-probe-preemptirq.c b/src/probes/lttng-probe-preemptirq.c similarity index 100% rename from probes/lttng-probe-preemptirq.c rename to src/probes/lttng-probe-preemptirq.c diff --git a/probes/lttng-probe-printk.c b/src/probes/lttng-probe-printk.c similarity index 100% rename from probes/lttng-probe-printk.c rename to src/probes/lttng-probe-printk.c diff --git a/probes/lttng-probe-random.c b/src/probes/lttng-probe-random.c similarity index 100% rename from probes/lttng-probe-random.c rename to src/probes/lttng-probe-random.c diff --git a/probes/lttng-probe-rcu.c b/src/probes/lttng-probe-rcu.c similarity index 100% rename from probes/lttng-probe-rcu.c rename to src/probes/lttng-probe-rcu.c diff --git a/probes/lttng-probe-regmap.c b/src/probes/lttng-probe-regmap.c similarity index 100% rename from probes/lttng-probe-regmap.c rename to src/probes/lttng-probe-regmap.c diff --git a/probes/lttng-probe-regulator.c b/src/probes/lttng-probe-regulator.c similarity index 100% rename from probes/lttng-probe-regulator.c rename to src/probes/lttng-probe-regulator.c diff --git a/probes/lttng-probe-rpm.c b/src/probes/lttng-probe-rpm.c similarity index 100% rename from probes/lttng-probe-rpm.c rename to src/probes/lttng-probe-rpm.c diff --git a/probes/lttng-probe-sched.c b/src/probes/lttng-probe-sched.c similarity index 100% rename from probes/lttng-probe-sched.c rename to src/probes/lttng-probe-sched.c diff --git a/probes/lttng-probe-scsi.c b/src/probes/lttng-probe-scsi.c similarity index 100% rename from probes/lttng-probe-scsi.c rename to src/probes/lttng-probe-scsi.c diff --git a/probes/lttng-probe-signal.c b/src/probes/lttng-probe-signal.c similarity index 100% rename from probes/lttng-probe-signal.c rename to src/probes/lttng-probe-signal.c diff --git a/probes/lttng-probe-skb.c b/src/probes/lttng-probe-skb.c similarity index 100% rename from probes/lttng-probe-skb.c rename to src/probes/lttng-probe-skb.c diff --git a/probes/lttng-probe-sock.c b/src/probes/lttng-probe-sock.c similarity index 100% rename from probes/lttng-probe-sock.c rename to src/probes/lttng-probe-sock.c diff --git a/probes/lttng-probe-statedump.c b/src/probes/lttng-probe-statedump.c similarity index 100% rename from probes/lttng-probe-statedump.c rename to src/probes/lttng-probe-statedump.c diff --git a/probes/lttng-probe-sunrpc.c b/src/probes/lttng-probe-sunrpc.c similarity index 100% rename from probes/lttng-probe-sunrpc.c rename to src/probes/lttng-probe-sunrpc.c diff --git a/probes/lttng-probe-timer.c b/src/probes/lttng-probe-timer.c similarity index 100% rename from probes/lttng-probe-timer.c rename to src/probes/lttng-probe-timer.c diff --git a/probes/lttng-probe-udp.c b/src/probes/lttng-probe-udp.c similarity index 100% rename from probes/lttng-probe-udp.c rename to src/probes/lttng-probe-udp.c diff --git a/probes/lttng-probe-user.c b/src/probes/lttng-probe-user.c similarity index 100% rename from probes/lttng-probe-user.c rename to src/probes/lttng-probe-user.c diff --git a/probes/lttng-probe-v4l2.c b/src/probes/lttng-probe-v4l2.c similarity index 100% rename from probes/lttng-probe-v4l2.c rename to src/probes/lttng-probe-v4l2.c diff --git a/probes/lttng-probe-vmscan.c b/src/probes/lttng-probe-vmscan.c similarity index 100% rename from probes/lttng-probe-vmscan.c rename to src/probes/lttng-probe-vmscan.c diff --git a/probes/lttng-probe-workqueue.c b/src/probes/lttng-probe-workqueue.c similarity index 100% rename from probes/lttng-probe-workqueue.c rename to src/probes/lttng-probe-workqueue.c diff --git a/probes/lttng-probe-writeback.c b/src/probes/lttng-probe-writeback.c similarity index 100% rename from probes/lttng-probe-writeback.c rename to src/probes/lttng-probe-writeback.c diff --git a/probes/lttng-probe-x86-exceptions.c b/src/probes/lttng-probe-x86-exceptions.c similarity index 100% rename from probes/lttng-probe-x86-exceptions.c rename to src/probes/lttng-probe-x86-exceptions.c diff --git a/probes/lttng-probe-x86-irq-vectors.c b/src/probes/lttng-probe-x86-irq-vectors.c similarity index 100% rename from probes/lttng-probe-x86-irq-vectors.c rename to src/probes/lttng-probe-x86-irq-vectors.c diff --git a/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c similarity index 100% rename from probes/lttng-uprobes.c rename to src/probes/lttng-uprobes.c diff --git a/probes/lttng.c b/src/probes/lttng.c similarity index 100% rename from probes/lttng.c rename to src/probes/lttng.c diff --git a/wrapper/fdtable.c b/src/wrapper/fdtable.c similarity index 100% rename from wrapper/fdtable.c rename to src/wrapper/fdtable.c diff --git a/wrapper/irqdesc.c b/src/wrapper/irqdesc.c similarity index 100% rename from wrapper/irqdesc.c rename to src/wrapper/irqdesc.c diff --git a/wrapper/kallsyms.c b/src/wrapper/kallsyms.c similarity index 100% rename from wrapper/kallsyms.c rename to src/wrapper/kallsyms.c diff --git a/wrapper/page_alloc.c b/src/wrapper/page_alloc.c similarity index 100% rename from wrapper/page_alloc.c rename to src/wrapper/page_alloc.c diff --git a/wrapper/random.c b/src/wrapper/random.c similarity index 100% rename from wrapper/random.c rename to src/wrapper/random.c diff --git a/wrapper/splice.c b/src/wrapper/splice.c similarity index 100% rename from wrapper/splice.c rename to src/wrapper/splice.c diff --git a/wrapper/trace-clock.c b/src/wrapper/trace-clock.c similarity index 100% rename from wrapper/trace-clock.c rename to src/wrapper/trace-clock.c -- 2.34.1