From 4318ae1be57eb7983ab4857a7a8eeb4a030a8216 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 3 Nov 2011 12:16:04 -0400 Subject: [PATCH] Move include/ust/ to include/lttng/ Keep all lttng project files under the same toplevel directory. Signed-off-by: Mathieu Desnoyers --- configure.ac | 6 +- include/Makefile.am | 60 +++++++++---------- include/{ust => lttng}/align.h | 4 +- include/{ust => lttng}/bitfield.h | 0 include/{ust => lttng}/bug.h | 0 include/{ust => lttng}/clock.h | 2 +- include/{ust => lttng}/compat.h | 0 include/{ust => lttng}/config.h.in | 0 include/{ust => lttng}/core.h | 4 +- include/{ust => lttng}/kcompat/compiler.h | 0 include/{ust => lttng}/kcompat/jhash.h | 0 include/{ust => lttng}/kcompat/kcompat.h | 6 +- include/{ust => lttng}/kcompat/types.h | 0 include/{ust => lttng}/marker-internal.h | 0 include/{ust => lttng}/marker.h | 0 include/{ust => lttng}/probe-internal.h | 0 include/{ust => lttng}/processor.h | 0 include/{ust => lttng}/ringbuffer-abi.h | 0 include/{ust => lttng}/ringbuffer-config.h | 10 ++-- include/{ust => lttng}/share.h | 0 include/{ust => lttng}/stringify.h | 0 include/{ust => lttng}/tracepoint-event.h | 2 +- include/{ust => lttng}/tracepoint-internal.h | 4 +- include/{ust => lttng}/tracepoint.h | 0 .../{ust/lttng-ust-abi.h => lttng/ust-abi.h} | 2 +- .../lttng-ust-comm.h => lttng/ust-comm.h} | 2 +- .../{ust/lttng-ust-ctl.h => lttng/ust-ctl.h} | 2 +- .../lttng-events.h => lttng/ust-events.h} | 4 +- .../ust-tracepoint-event-reset.h} | 2 +- .../ust-tracepoint-event.h} | 28 ++++----- .../lttng-tracer.h => lttng/ust-tracer.h} | 2 +- include/{ust => lttng}/ust.h | 0 include/{ust => lttng}/usterr-signal-safe.h | 5 +- include/{ust => lttng}/vatomic.h | 0 include/{ust => lttng}/version.h.in | 0 include/{ust => lttng}/wait.h | 0 include/usterr.h | 5 +- liblttng-ust-comm/lttng-ust-comm.c | 2 +- libringbuffer/api.h | 2 +- libringbuffer/backend.h | 2 +- libringbuffer/backend_internal.h | 2 +- libringbuffer/frontend_api.h | 2 +- libringbuffer/frontend_internal.h | 2 +- libringbuffer/frontend_types.h | 6 +- libringbuffer/ring_buffer_abi.c | 2 +- libringbuffer/ring_buffer_backend.c | 4 +- libringbuffer/ring_buffer_frontend.c | 2 +- libringbuffer/shm.c | 2 +- libringbuffer/shm.h | 4 +- libringbuffer/smp.c | 4 +- libringbuffer/smp.h | 2 +- libust/ltt-context.c | 6 +- libust/ltt-events.c | 12 ++-- libust/ltt-probes.c | 4 +- libust/ltt-ring-buffer-client.h | 6 +- libust/ltt-ring-buffer-metadata-client.h | 4 +- libust/ltt-tracer-core.h | 12 ++-- libust/ltt-tracer.h | 6 +- libust/lttng-context-procname.c | 6 +- libust/lttng-context-pthread-id.c | 6 +- libust/lttng-context-vpid.c | 6 +- libust/lttng-context-vtid.c | 6 +- libust/lttng-ust-abi.c | 8 +-- libust/lttng-ust-comm.c | 14 ++--- libust/probes/lttng-probe-ust.h | 4 +- libust/tracepoint.c | 10 ++-- libust/ust-core.c | 2 +- libustctl/ustctl.c | 8 +-- libustfork/ustfork.c | 2 +- tests/fork/ust_tests_fork.h | 4 +- tests/hello/ust_tests_hello.h | 4 +- tests/ust-basic-tracing/ust-basic-tracing.c | 2 +- tests/ust-multi-test/ust-multi-test.c | 2 +- 73 files changed, 156 insertions(+), 166 deletions(-) rename include/{ust => lttng}/align.h (97%) rename include/{ust => lttng}/bitfield.h (100%) rename include/{ust => lttng}/bug.h (100%) rename include/{ust => lttng}/clock.h (98%) rename include/{ust => lttng}/compat.h (100%) rename include/{ust => lttng}/config.h.in (100%) rename include/{ust => lttng}/core.h (98%) rename include/{ust => lttng}/kcompat/compiler.h (100%) rename include/{ust => lttng}/kcompat/jhash.h (100%) rename include/{ust => lttng}/kcompat/kcompat.h (93%) rename include/{ust => lttng}/kcompat/types.h (100%) rename include/{ust => lttng}/marker-internal.h (100%) rename include/{ust => lttng}/marker.h (100%) rename include/{ust => lttng}/probe-internal.h (100%) rename include/{ust => lttng}/processor.h (100%) rename include/{ust => lttng}/ringbuffer-abi.h (100%) rename include/{ust => lttng}/ringbuffer-config.h (98%) rename include/{ust => lttng}/share.h (100%) rename include/{ust => lttng}/stringify.h (100%) rename include/{ust => lttng}/tracepoint-event.h (98%) rename include/{ust => lttng}/tracepoint-internal.h (98%) rename include/{ust => lttng}/tracepoint.h (100%) rename include/{ust/lttng-ust-abi.h => lttng/ust-abi.h} (99%) rename include/{ust/lttng-ust-comm.h => lttng/ust-comm.h} (99%) rename include/{ust/lttng-ust-ctl.h => lttng/ust-ctl.h} (99%) rename include/{ust/lttng-events.h => lttng/ust-events.h} (99%) rename include/{ust/lttng-tracepoint-event-reset.h => lttng/ust-tracepoint-event-reset.h} (96%) rename include/{ust/lttng-tracepoint-event.h => lttng/ust-tracepoint-event.h} (96%) rename include/{ust/lttng-tracer.h => lttng/ust-tracer.h} (98%) rename include/{ust => lttng}/ust.h (100%) rename include/{ust => lttng}/usterr-signal-safe.h (98%) rename include/{ust => lttng}/vatomic.h (100%) rename include/{ust => lttng}/version.h.in (100%) rename include/{ust => lttng}/wait.h (100%) diff --git a/configure.ac b/configure.ac index 856894b2..be93880c 100644 --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,8 @@ AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([config]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_CONFIG_SRCDIR([include/ust/tracepoint.h]) -AC_CONFIG_HEADERS([config.h include/ust/config.h]) +AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) +AC_CONFIG_HEADERS([config.h include/lttng/config.h]) AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) # Compute minor/major version numbers major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'` @@ -221,7 +221,7 @@ AC_CONFIG_FILES([ libustfork/Makefile snprintf/Makefile ust.pc - include/ust/version.h + include/lttng/version.h libustjava/Makefile ]) AC_OUTPUT diff --git a/include/Makefile.am b/include/Makefile.am index 4f376529..08fc038d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,37 +1,37 @@ nobase_include_HEADERS = \ - ust/marker.h \ - ust/tracepoint.h \ - ust/tracepoint-event.h \ - ust/lttng-tracepoint-event.h \ - ust/lttng-tracepoint-event-reset.h \ - ust/lttng-events.h \ - ust/lttng-ust-ctl.h \ - ust/version.h \ - ust/lttng-ust-abi.h \ - ust/lttng-ust-comm.h \ - ust/ringbuffer-abi.h \ - ust/lttng-tracer.h \ - ust/usterr-signal-safe.h \ - ust/config.h \ - ust/share.h \ - ust/ust.h \ - ust/core.h + lttng/marker.h \ + lttng/tracepoint.h \ + lttng/tracepoint-event.h \ + lttng/ust-tracepoint-event.h \ + lttng/ust-tracepoint-event-reset.h \ + lttng/ust-events.h \ + lttng/ust-ctl.h \ + lttng/version.h \ + lttng/ust-abi.h \ + lttng/ust-comm.h \ + lttng/ringbuffer-abi.h \ + lttng/ust-tracer.h \ + lttng/usterr-signal-safe.h \ + lttng/config.h \ + lttng/share.h \ + lttng/ust.h \ + lttng/core.h # note: usterr-signal-safe.h, core.h and share.h need namespace cleanup. noinst_HEADERS = \ usterr.h \ ust_snprintf.h \ - ust/compat.h \ - ust/marker-internal.h \ - ust/tracepoint-internal.h \ - ust/clock.h \ - ust/probe-internal.h \ - ust/kcompat/kcompat.h \ - ust/kcompat/jhash.h \ - ust/kcompat/compiler.h \ - ust/kcompat/types.h \ - ust/stringify.h \ - ust/wait.h \ - ust/ringbuffer-config.h \ - ust/processor.h + lttng/compat.h \ + lttng/marker-internal.h \ + lttng/tracepoint-internal.h \ + lttng/clock.h \ + lttng/probe-internal.h \ + lttng/kcompat/kcompat.h \ + lttng/kcompat/jhash.h \ + lttng/kcompat/compiler.h \ + lttng/kcompat/types.h \ + lttng/stringify.h \ + lttng/wait.h \ + lttng/ringbuffer-config.h \ + lttng/processor.h diff --git a/include/ust/align.h b/include/lttng/align.h similarity index 97% rename from include/ust/align.h rename to include/lttng/align.h index cd713cc2..12fc61b9 100644 --- a/include/ust/align.h +++ b/include/lttng/align.h @@ -2,14 +2,14 @@ #define _UST_ALIGN_H /* - * ust/align.h + * lttng/align.h * * (C) Copyright 2010-2011 - Mathieu Desnoyers * * Dual LGPL v2.1/GPL v2 license. */ -#include +#include /* * Align pointer on natural object alignment. diff --git a/include/ust/bitfield.h b/include/lttng/bitfield.h similarity index 100% rename from include/ust/bitfield.h rename to include/lttng/bitfield.h diff --git a/include/ust/bug.h b/include/lttng/bug.h similarity index 100% rename from include/ust/bug.h rename to include/lttng/bug.h diff --git a/include/ust/clock.h b/include/lttng/clock.h similarity index 98% rename from include/ust/clock.h rename to include/lttng/clock.h index ae44beca..ebcd624f 100644 --- a/include/ust/clock.h +++ b/include/lttng/clock.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include /* TRACE CLOCK */ diff --git a/include/ust/compat.h b/include/lttng/compat.h similarity index 100% rename from include/ust/compat.h rename to include/lttng/compat.h diff --git a/include/ust/config.h.in b/include/lttng/config.h.in similarity index 100% rename from include/ust/config.h.in rename to include/lttng/config.h.in diff --git a/include/ust/core.h b/include/lttng/core.h similarity index 98% rename from include/ust/core.h rename to include/lttng/core.h index 4e75c515..5bd19829 100644 --- a/include/ust/core.h +++ b/include/lttng/core.h @@ -21,7 +21,7 @@ */ #include -#include +#include #include #include @@ -105,7 +105,7 @@ void *zmalloc_align(size_t len) /* MATH */ -#include +#include static inline unsigned int hweight32(unsigned int w) { unsigned int res = w - ((w >> 1) & 0x55555555); diff --git a/include/ust/kcompat/compiler.h b/include/lttng/kcompat/compiler.h similarity index 100% rename from include/ust/kcompat/compiler.h rename to include/lttng/kcompat/compiler.h diff --git a/include/ust/kcompat/jhash.h b/include/lttng/kcompat/jhash.h similarity index 100% rename from include/ust/kcompat/jhash.h rename to include/lttng/kcompat/jhash.h diff --git a/include/ust/kcompat/kcompat.h b/include/lttng/kcompat/kcompat.h similarity index 93% rename from include/ust/kcompat/kcompat.h rename to include/lttng/kcompat/kcompat.h index be8d9269..3fdea648 100644 --- a/include/ust/kcompat/kcompat.h +++ b/include/lttng/kcompat/kcompat.h @@ -56,8 +56,8 @@ #include /* Kernel libs */ -#include -#include -#include +#include +#include +#include #endif /* KCOMPAT_H */ diff --git a/include/ust/kcompat/types.h b/include/lttng/kcompat/types.h similarity index 100% rename from include/ust/kcompat/types.h rename to include/lttng/kcompat/types.h diff --git a/include/ust/marker-internal.h b/include/lttng/marker-internal.h similarity index 100% rename from include/ust/marker-internal.h rename to include/lttng/marker-internal.h diff --git a/include/ust/marker.h b/include/lttng/marker.h similarity index 100% rename from include/ust/marker.h rename to include/lttng/marker.h diff --git a/include/ust/probe-internal.h b/include/lttng/probe-internal.h similarity index 100% rename from include/ust/probe-internal.h rename to include/lttng/probe-internal.h diff --git a/include/ust/processor.h b/include/lttng/processor.h similarity index 100% rename from include/ust/processor.h rename to include/lttng/processor.h diff --git a/include/ust/ringbuffer-abi.h b/include/lttng/ringbuffer-abi.h similarity index 100% rename from include/ust/ringbuffer-abi.h rename to include/lttng/ringbuffer-abi.h diff --git a/include/ust/ringbuffer-config.h b/include/lttng/ringbuffer-config.h similarity index 98% rename from include/ust/ringbuffer-config.h rename to include/lttng/ringbuffer-config.h index 1d4ce67d..4fa57750 100644 --- a/include/ust/ringbuffer-config.h +++ b/include/lttng/ringbuffer-config.h @@ -13,10 +13,10 @@ */ #include -#include "ust/lttng-tracer.h" -#include "ust/usterr-signal-safe.h" -#include "ust/kcompat/kcompat.h" -#include "ust/align.h" +#include "lttng/ust-tracer.h" +#include "lttng/usterr-signal-safe.h" +#include "lttng/kcompat/kcompat.h" +#include "lttng/align.h" struct lttng_ust_lib_ring_buffer; struct channel; @@ -304,6 +304,6 @@ int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config * return 0; } -#include +#include #endif /* _LINUX_RING_BUFFER_CONFIG_H */ diff --git a/include/ust/share.h b/include/lttng/share.h similarity index 100% rename from include/ust/share.h rename to include/lttng/share.h diff --git a/include/ust/stringify.h b/include/lttng/stringify.h similarity index 100% rename from include/ust/stringify.h rename to include/lttng/stringify.h diff --git a/include/ust/tracepoint-event.h b/include/lttng/tracepoint-event.h similarity index 98% rename from include/ust/tracepoint-event.h rename to include/lttng/tracepoint-event.h index b4bd59cb..65120d4b 100644 --- a/include/ust/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -90,7 +90,7 @@ extern "C" { #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) -#include +#include #undef TRACEPOINT_EVENT #undef TRACEPOINT_EVENT_CLASS diff --git a/include/ust/tracepoint-internal.h b/include/lttng/tracepoint-internal.h similarity index 98% rename from include/ust/tracepoint-internal.h rename to include/lttng/tracepoint-internal.h index 93d89257..928eb4f3 100644 --- a/include/ust/tracepoint-internal.h +++ b/include/lttng/tracepoint-internal.h @@ -30,9 +30,9 @@ */ #include -#include +#include #include -#include +#include struct tracepoint_lib { struct tracepoint * const *tracepoints_start; diff --git a/include/ust/tracepoint.h b/include/lttng/tracepoint.h similarity index 100% rename from include/ust/tracepoint.h rename to include/lttng/tracepoint.h diff --git a/include/ust/lttng-ust-abi.h b/include/lttng/ust-abi.h similarity index 99% rename from include/ust/lttng-ust-abi.h rename to include/lttng/ust-abi.h index d2b3340f..ced2929a 100644 --- a/include/ust/lttng-ust-abi.h +++ b/include/lttng/ust-abi.h @@ -2,7 +2,7 @@ #define _LTTNG_UST_ABI_H /* - * lttng-ust-abi.h + * lttng/ust-abi.h * * Copyright 2010-2011 (c) - Mathieu Desnoyers * diff --git a/include/ust/lttng-ust-comm.h b/include/lttng/ust-comm.h similarity index 99% rename from include/ust/lttng-ust-comm.h rename to include/lttng/ust-comm.h index 614890d4..5fa417ee 100644 --- a/include/ust/lttng-ust-comm.h +++ b/include/lttng/ust-comm.h @@ -28,7 +28,7 @@ #include #include -#include +#include /* * Default timeout the application waits for the sessiond to send its diff --git a/include/ust/lttng-ust-ctl.h b/include/lttng/ust-ctl.h similarity index 99% rename from include/ust/lttng-ust-ctl.h rename to include/lttng/ust-ctl.h index de5eeafe..fc6671d4 100644 --- a/include/ust/lttng-ust-ctl.h +++ b/include/lttng/ust-ctl.h @@ -20,7 +20,7 @@ #ifndef _LTTNG_UST_CTL_H #define _LTTNG_UST_CTL_H -#include +#include int ustctl_register_done(int sock); int ustctl_create_session(int sock); diff --git a/include/ust/lttng-events.h b/include/lttng/ust-events.h similarity index 99% rename from include/ust/lttng-events.h rename to include/lttng/ust-events.h index e028f6b2..95af893a 100644 --- a/include/ust/lttng-events.h +++ b/include/lttng/ust-events.h @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/include/ust/lttng-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h similarity index 96% rename from include/ust/lttng-tracepoint-event-reset.h rename to include/lttng/ust-tracepoint-event-reset.h index b765c812..9485ee0e 100644 --- a/include/ust/lttng-tracepoint-event-reset.h +++ b/include/lttng/ust-tracepoint-event-reset.h @@ -1,5 +1,5 @@ /* - * lttng-tracepoint-events-reset.h + * lttng/ust-tracepoint-events-reset.h * * Copyright (C) 2010-2011 Mathieu Desnoyers * diff --git a/include/ust/lttng-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h similarity index 96% rename from include/ust/lttng-tracepoint-event.h rename to include/lttng/ust-tracepoint-event.h index 46d8b933..b9abbd31 100644 --- a/include/ust/lttng-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* * Macro declarations used for all stages. @@ -109,9 +109,7 @@ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include - -/* Named field types must be defined in lttng-types.h */ +#include #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ @@ -191,7 +189,7 @@ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include +#include #undef TP_PROTO #define TP_PROTO(args...) args @@ -212,10 +210,8 @@ static void __event_probe__##_name(void *__data); * Create an array of events. */ -/* Named field types must be defined in lttng-types.h */ - /* Reset all macros within TRACEPOINT_EVENT */ -#include +#include #undef TRACEPOINT_EVENT_INSTANCE_NOARGS #define TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ @@ -266,9 +262,7 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = { */ /* Reset all macros within TRACEPOINT_EVENT */ -#include - -/* Named field types must be defined in lttng-types.h */ +#include #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ @@ -327,9 +321,7 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include - -/* Named field types must be defined in lttng-types.h */ +#include #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ @@ -382,7 +374,7 @@ static inline size_t __event_get_align__##_name(_proto) \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include +#include #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ @@ -504,7 +496,7 @@ static void __event_probe__##_name(void *__data) \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include +#include #define TP_ID1(_token, _system) _token##_system #define TP_ID(_token, _system) TP_ID1(_token, _system) diff --git a/include/ust/lttng-tracer.h b/include/lttng/ust-tracer.h similarity index 98% rename from include/ust/lttng-tracer.h rename to include/lttng/ust-tracer.h index f2bdbf51..234e75c0 100644 --- a/include/ust/lttng-tracer.h +++ b/include/lttng/ust-tracer.h @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS /* Align data on its natural alignment */ diff --git a/include/ust/ust.h b/include/lttng/ust.h similarity index 100% rename from include/ust/ust.h rename to include/lttng/ust.h diff --git a/include/ust/usterr-signal-safe.h b/include/lttng/usterr-signal-safe.h similarity index 98% rename from include/ust/usterr-signal-safe.h rename to include/lttng/usterr-signal-safe.h index 998d8d89..894149a3 100644 --- a/include/ust/usterr-signal-safe.h +++ b/include/lttng/usterr-signal-safe.h @@ -27,9 +27,8 @@ #include #include -#include - -#include +#include +#include enum ust_loglevel { UST_LOGLEVEL_UNKNOWN = 0, diff --git a/include/ust/vatomic.h b/include/lttng/vatomic.h similarity index 100% rename from include/ust/vatomic.h rename to include/lttng/vatomic.h diff --git a/include/ust/version.h.in b/include/lttng/version.h.in similarity index 100% rename from include/ust/version.h.in rename to include/lttng/version.h.in diff --git a/include/ust/wait.h b/include/lttng/wait.h similarity index 100% rename from include/ust/wait.h rename to include/lttng/wait.h diff --git a/include/usterr.h b/include/usterr.h index 5f839cb6..820d4f03 100644 --- a/include/usterr.h +++ b/include/usterr.h @@ -27,9 +27,8 @@ #include #include -#include - -#include "share.h" +#include +#include "lttng/share.h" enum ust_loglevel { UST_LOGLEVEL_UNKNOWN = 0, diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index 96589600..2903d575 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -29,7 +29,7 @@ #include #include -#include +#include /* * Human readable error message. diff --git a/libringbuffer/api.h b/libringbuffer/api.h index 2f153268..25474e77 100644 --- a/libringbuffer/api.h +++ b/libringbuffer/api.h @@ -13,7 +13,7 @@ #include "backend.h" #include "frontend.h" -#include +#include /* * ring_buffer_frontend_api.h contains static inline functions that depend on diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h index 45ab53d0..69c47ab6 100644 --- a/libringbuffer/backend.h +++ b/libringbuffer/backend.h @@ -16,7 +16,7 @@ #include -#include "ust/core.h" +#include "lttng/core.h" /* Internal helpers */ #include "backend_internal.h" diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h index c0721d15..e3192be7 100644 --- a/libringbuffer/backend_internal.h +++ b/libringbuffer/backend_internal.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include "backend_types.h" #include "frontend_types.h" #include "shm.h" diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h index 0868a4bb..24f94acf 100644 --- a/libringbuffer/frontend_api.h +++ b/libringbuffer/frontend_api.h @@ -18,7 +18,7 @@ */ #include "frontend.h" -#include "ust/core.h" +#include "lttng/core.h" #include #include diff --git a/libringbuffer/frontend_internal.h b/libringbuffer/frontend_internal.h index 4b4135bb..dcf86b77 100644 --- a/libringbuffer/frontend_internal.h +++ b/libringbuffer/frontend_internal.h @@ -18,7 +18,7 @@ #include -#include +#include #include "backend_types.h" #include "frontend_types.h" #include "shm.h" diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h index 84593260..7d9166e0 100644 --- a/libringbuffer/frontend_types.h +++ b/libringbuffer/frontend_types.h @@ -21,10 +21,10 @@ #include #include -#include "ust/core.h" +#include "lttng/core.h" -#include -#include +#include +#include #include "backend_types.h" #include "shm_internal.h" diff --git a/libringbuffer/ring_buffer_abi.c b/libringbuffer/ring_buffer_abi.c index 420a4e99..ed52b718 100644 --- a/libringbuffer/ring_buffer_abi.c +++ b/libringbuffer/ring_buffer_abi.c @@ -10,7 +10,7 @@ #include "backend.h" #include "frontend.h" -#include +#include static int put_ulong(unsigned long val, unsigned long arg) { diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c index 50cb1938..f2169aa7 100644 --- a/libringbuffer/ring_buffer_backend.c +++ b/libringbuffer/ring_buffer_backend.c @@ -8,9 +8,9 @@ #include -#include "ust/core.h" +#include "lttng/core.h" -#include +#include #include "backend.h" #include "frontend.h" #include "smp.h" diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c index 82194bf8..310e0b93 100644 --- a/libringbuffer/ring_buffer_frontend.c +++ b/libringbuffer/ring_buffer_frontend.c @@ -46,7 +46,7 @@ #include #include "smp.h" -#include +#include #include "backend.h" #include "frontend.h" #include "shm.h" diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c index fd0919fa..fc7fbfb2 100644 --- a/libringbuffer/shm.c +++ b/libringbuffer/shm.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include struct shm_object_table *shm_object_table_create(size_t max_nb_obj) { diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h index 6cac7295..e8fc8d70 100644 --- a/libringbuffer/shm.h +++ b/libringbuffer/shm.h @@ -10,8 +10,8 @@ */ #include -#include -#include "ust/core.h" +#include +#include "lttng/core.h" #include "shm_types.h" /* diff --git a/libringbuffer/smp.c b/libringbuffer/smp.c index 3f86ac86..f9dbd75a 100644 --- a/libringbuffer/smp.c +++ b/libringbuffer/smp.c @@ -1,5 +1,5 @@ /* - * libust/smp.c + * libringbuffer/smp.c * * Copyright 2011 (c) - Mathieu Desnoyers * @@ -7,7 +7,7 @@ */ #include -#include "ust/core.h" +#include "lttng/core.h" #include "usterr.h" #include #include "smp.h" diff --git a/libringbuffer/smp.h b/libringbuffer/smp.h index dd326d83..755c65fc 100644 --- a/libringbuffer/smp.h +++ b/libringbuffer/smp.h @@ -9,7 +9,7 @@ * Dual LGPL v2.1/GPL v2 license. */ -#include +#include /* * 4kB of per-cpu data available. Enough to hold the control structures, diff --git a/libust/ltt-context.c b/libust/ltt-context.c index 7f8351ec..90747a55 100644 --- a/libust/ltt-context.c +++ b/libust/ltt-context.c @@ -8,9 +8,9 @@ * Dual LGPL v2.1/GPL v2 license. */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/libust/ltt-events.c b/libust/ltt-events.c index f48d72b6..68531bcd 100644 --- a/libust/ltt-events.c +++ b/libust/ltt-events.c @@ -18,20 +18,20 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include "ust/core.h" +#include +#include +#include "lttng/core.h" #include "ltt-tracer.h" #include "ltt-tracer-core.h" -#include "ust/wait.h" +#include "lttng/wait.h" #include "../libringbuffer/shm.h" typedef u32 uint32_t; -#include +#include /* * The sessions mutex is the centralized mutex across UST tracing diff --git a/libust/ltt-probes.c b/libust/ltt-probes.c index 04392d8e..66ee971c 100644 --- a/libust/ltt-probes.c +++ b/libust/ltt-probes.c @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include #include "ltt-tracer-core.h" diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h index 6c6433cd..a1bc8c32 100644 --- a/libust/ltt-ring-buffer-client.h +++ b/libust/ltt-ring-buffer-client.h @@ -9,9 +9,9 @@ */ #include -#include -#include "ust/bitfield.h" -#include "ust/clock.h" +#include +#include "lttng/bitfield.h" +#include "lttng/clock.h" #include "ltt-tracer.h" #include "../libringbuffer/frontend_types.h" diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h index 77093488..d1a83d53 100644 --- a/libust/ltt-ring-buffer-metadata-client.h +++ b/libust/ltt-ring-buffer-metadata-client.h @@ -9,8 +9,8 @@ */ #include -#include -#include "ust/bitfield.h" +#include +#include "lttng/bitfield.h" #include "ltt-tracer.h" #include "../libringbuffer/frontend_types.h" diff --git a/libust/ltt-tracer-core.h b/libust/ltt-tracer-core.h index fe2ecb9e..20ed0c0e 100644 --- a/libust/ltt-tracer-core.h +++ b/libust/ltt-tracer-core.h @@ -21,14 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include +#include +#include #include -#include -#include "ust/bug.h" +#include +#include "lttng/bug.h" -#include +#include struct ltt_session; struct ltt_channel; diff --git a/libust/ltt-tracer.h b/libust/ltt-tracer.h index 45da9c59..6ab80e7c 100644 --- a/libust/ltt-tracer.h +++ b/libust/ltt-tracer.h @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "ltt-tracer-core.h" /* Number of bytes to log with a read/write event */ diff --git a/libust/lttng-context-procname.c b/libust/lttng-context-procname.c index c1f1ced9..b9bae82e 100644 --- a/libust/lttng-context-procname.c +++ b/libust/lttng-context-procname.c @@ -8,9 +8,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #define PROCNAME_LEN 17 /* includes \0 */ diff --git a/libust/lttng-context-pthread-id.c b/libust/lttng-context-pthread-id.c index 991df22b..62eda808 100644 --- a/libust/lttng-context-pthread-id.c +++ b/libust/lttng-context-pthread-id.c @@ -8,9 +8,9 @@ */ #include -#include -#include -#include +#include +#include +#include static size_t pthread_id_get_size(size_t offset) diff --git a/libust/lttng-context-vpid.c b/libust/lttng-context-vpid.c index 1fc8aadb..db76747a 100644 --- a/libust/lttng-context-vpid.c +++ b/libust/lttng-context-vpid.c @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef __linux__ static inline diff --git a/libust/lttng-context-vtid.c b/libust/lttng-context-vtid.c index 25e2febf..6f7e078d 100644 --- a/libust/lttng-context-vtid.c +++ b/libust/lttng-context-vtid.c @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef __linux__ #include diff --git a/libust/lttng-ust-abi.c b/libust/lttng-ust-abi.c index ccfac129..6d17c200 100644 --- a/libust/lttng-ust-abi.c +++ b/libust/lttng-ust-abi.c @@ -24,12 +24,12 @@ * Dual LGPL v2.1/GPL v2 license. */ -#include +#include #include #include -#include -#include -#include "ust/core.h" +#include +#include +#include "lttng/core.h" #include "ltt-tracer.h" /* diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c index 3327e10b..1246c654 100644 --- a/libust/lttng-ust-comm.c +++ b/libust/lttng-ust-comm.c @@ -38,13 +38,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "ltt-tracer-core.h" /* diff --git a/libust/probes/lttng-probe-ust.h b/libust/probes/lttng-probe-ust.h index ba7ff3a1..3394d086 100644 --- a/libust/probes/lttng-probe-ust.h +++ b/libust/probes/lttng-probe-ust.h @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include TRACEPOINT_EVENT(lttng_metadata, @@ -48,4 +48,4 @@ TRACEPOINT_EVENT(lttng_metadata, #endif /* _TRACEPOINT_LTTNG_UST_H */ /* This part must be outside protection */ -#include +#include diff --git a/libust/tracepoint.c b/libust/tracepoint.c index 1a184636..8bf87528 100644 --- a/libust/tracepoint.c +++ b/libust/tracepoint.c @@ -21,15 +21,15 @@ #define _LGPL_SOURCE #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include "ltt-tracer-core.h" /* Set to 1 to enable tracepoint debug output */ diff --git a/libust/ust-core.c b/libust/ust-core.c index cb87b745..b5cc8cf8 100644 --- a/libust/ust-core.c +++ b/libust/ust-core.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include volatile enum ust_loglevel ust_loglevel; diff --git a/libustctl/ustctl.c b/libustctl/ustctl.c index db9aa0c8..6f3d1ed9 100644 --- a/libustctl/ustctl.c +++ b/libustctl/ustctl.c @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../libringbuffer/backend.h" #include "../libringbuffer/frontend.h" diff --git a/libustfork/ustfork.c b/libustfork/ustfork.c index b16d4150..5e6acba1 100644 --- a/libustfork/ustfork.c +++ b/libustfork/ustfork.c @@ -26,7 +26,7 @@ #include #include "usterr.h" -#include +#include struct user_desc; diff --git a/tests/fork/ust_tests_fork.h b/tests/fork/ust_tests_fork.h index 7d87bb59..27e6b47e 100644 --- a/tests/fork/ust_tests_fork.h +++ b/tests/fork/ust_tests_fork.h @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include TRACEPOINT_EVENT_NOARGS(ust_tests_fork_before_fork, @@ -53,4 +53,4 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_fork_after_exec, #define TRACEPOINT_INCLUDE_FILE ust_tests_fork /* This part must be outside protection */ -#include +#include diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h index 9e5043dd..5ad67f48 100644 --- a/tests/hello/ust_tests_hello.h +++ b/tests/hello/ust_tests_hello.h @@ -26,7 +26,7 @@ extern "C" { * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include TRACEPOINT_EVENT(ust_tests_hello_tptest, TP_PROTO(int anint, int netint, long *values, @@ -64,7 +64,7 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler, #define TRACEPOINT_INCLUDE_FILE ust_tests_hello /* This part must be outside protection */ -#include +#include #ifdef __cplusplus } diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c index 49a0a3af..43628bd4 100644 --- a/tests/ust-basic-tracing/ust-basic-tracing.c +++ b/tests/ust-basic-tracing/ust-basic-tracing.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include "../../libringbuffer/backend.h" #include "../../libringbuffer/frontend.h" diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c index d0ff9277..541ed44b 100644 --- a/tests/ust-multi-test/ust-multi-test.c +++ b/tests/ust-multi-test/ust-multi-test.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include <../../libringbuffer/backend.h> #include <../../libringbuffer/frontend.h> -- 2.34.1