The ABI bump gives us the opportunity to namespace all public symbols
under the 'lttng_ust_' prefix. Namespace all API symbols and macros
under 'lttng_ust_' / 'LTTNG_UST_' and add compat macros to keep
compatibility with the previous API.
Change-Id: I41531d9e69604f1809d035147779c8ceeed2add7
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
13 files changed:
LTTNG_UST_TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
LTTNG_UST_TP_FIELDS(
lttng_ust_field_sequence_text(char, msg, msg, unsigned int, len)
LTTNG_UST_TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
LTTNG_UST_TP_FIELDS(
lttng_ust_field_sequence_text(char, msg, msg, unsigned int, len)
+ lttng_ust_field_unused(ip)
)
)
LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_tracef, event, LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG)
)
)
LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_tracef, event, LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG)
lttng_ust_field_string(file, file)
lttng_ust_field_string(func, func)
lttng_ust_field_sequence_text(char, msg, msg, unsigned int, len)
lttng_ust_field_string(file, file)
lttng_ust_field_string(func, func)
lttng_ust_field_sequence_text(char, msg, msg, unsigned int, len)
+ lttng_ust_field_unused(ip)
#define ctf_string lttng_ust_field_string
#define ctf_string_nowrite lttng_ust_field_string_nowrite
#define ctf_string lttng_ust_field_string
#define ctf_string_nowrite lttng_ust_field_string_nowrite
+
+#define ctf_unused lttng_ust_field_unused
+#define ctf_unused_nowrite lttng_ust_field_unused_nowrite
#endif /* #if LTTNG_UST_COMPAT_API(0) */
#ifdef __cplusplus
#endif /* #if LTTNG_UST_COMPAT_API(0) */
#ifdef __cplusplus
#define lttng_ust_field_string_nowrite(_item, _src) \
lttng_ust__field_string(_item, _src, 1)
#define lttng_ust_field_string_nowrite(_item, _src) \
lttng_ust__field_string(_item, _src, 1)
-#undef ctf_unused_nowrite
-#define ctf_unused_nowrite(_src) \
- _ctf_unused(_src)
+#undef lttng_ust_field_unused_nowrite
+#define lttng_ust_field_unused_nowrite(_src) \
+ lttng_ust__field_unused(_src)
#undef ctf_enum_nowrite
#define ctf_enum_nowrite(_provider, _name, _type, _item, _src) \
#undef ctf_enum_nowrite
#define ctf_enum_nowrite(_provider, _name, _type, _item, _src) \
#undef lttng_ust__field_string
#define lttng_ust__field_string(_item, _src, _nowrite)
#undef lttng_ust__field_string
#define lttng_ust__field_string(_item, _src, _nowrite)
-#undef _ctf_unused
-#define _ctf_unused(_src)
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)
#undef lttng_ust_field_string
#define lttng_ust_field_string(_item, _src)
#undef lttng_ust_field_string
#define lttng_ust_field_string(_item, _src)
-#undef ctf_unused
-#define ctf_unused(_src)
+#undef lttng_ust_field_unused
+#define lttng_ust_field_unused(_src)
#undef ctf_enum
#define ctf_enum(_provider, _name, _type, _item, _src)
#undef ctf_enum
#define ctf_enum(_provider, _name, _type, _item, _src)
#undef lttng_ust_field_string_nowrite
#define lttng_ust_field_string_nowrite(_item, _src)
#undef lttng_ust_field_string_nowrite
#define lttng_ust_field_string_nowrite(_item, _src)
-#undef ctf_unused_nowrite
-#define ctf_unused_nowrite(_src)
+#undef lttng_ust_field_unused_nowrite
+#define lttng_ust_field_unused_nowrite(_src)
#undef ctf_enum_nowrite
#define ctf_enum_nowrite(_provider, _name, _type, _item, _src)
#undef ctf_enum_nowrite
#define ctf_enum_nowrite(_provider, _name, _type, _item, _src)
#define lttng_ust_field_string(_item, _src) \
lttng_ust__field_string(_item, _src, 0)
#define lttng_ust_field_string(_item, _src) \
lttng_ust__field_string(_item, _src, 0)
-#undef ctf_unused
-#define ctf_unused(_src) \
- _ctf_unused(_src)
+#undef lttng_ust_field_unused
+#define lttng_ust_field_unused(_src) \
+ lttng_ust__field_unused(_src)
#undef ctf_enum
#define ctf_enum(_provider, _name, _type, _item, _src) \
#undef ctf_enum
#define ctf_enum(_provider, _name, _type, _item, _src) \
-#undef _ctf_unused
-#define _ctf_unused(_src)
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
__event_len += __dynamic_len[__dynamic_len_idx++] = \
strlen((_src) ? (_src) : LTTNG_UST__NULL_STRING) + 1;
__event_len += __dynamic_len[__dynamic_len_idx++] = \
strlen((_src) ? (_src) : LTTNG_UST__NULL_STRING) + 1;
-#undef _ctf_unused
-#define _ctf_unused(_src) \
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src) \
if (0) \
(void) (_src); /* Unused */
if (0) \
(void) (_src); /* Unused */
__stack_data += sizeof(void *); \
}
__stack_data += sizeof(void *); \
}
-#undef _ctf_unused
-#define _ctf_unused(_src) \
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src) \
if (0) \
(void) (_src); /* Unused */
if (0) \
(void) (_src); /* Unused */
-#undef _ctf_unused
-#define _ctf_unused(_src) \
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src) \
if (0) \
(void) (_src); /* Unused */
if (0) \
(void) (_src); /* Unused */
lttng_ust__get_dynamic_len(dest)); \
}
lttng_ust__get_dynamic_len(dest)); \
}
-#undef _ctf_unused
-#define _ctf_unused(_src)
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
LTTNG_UST_TP_ARGS(void *, func_addr),
LTTNG_UST_TP_FIELDS(
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
LTTNG_UST_TP_ARGS(void *, func_addr),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(func_addr)
int, flags, uint64_t, memsz, uint8_t, has_build_id,
uint8_t, has_debug_link),
LTTNG_UST_TP_FIELDS(
int, flags, uint64_t, memsz, uint8_t, has_build_id,
uint8_t, has_debug_link),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_integer_hex(int, flags, flags)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_integer_hex(int, flags, flags)
uint64_t, memsz, uint8_t, has_build_id,
uint8_t, has_debug_link),
LTTNG_UST_TP_FIELDS(
uint64_t, memsz, uint8_t, has_build_id,
uint8_t, has_debug_link),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_integer(Lmid_t, nsid, nsid)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_integer(Lmid_t, nsid, nsid)
size_t, build_id_len
),
LTTNG_UST_TP_FIELDS(
size_t, build_id_len
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
size_t, build_id_len)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
size_t, build_id_len)
uint32_t, crc
),
LTTNG_UST_TP_FIELDS(
uint32_t, crc
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint32_t, crc, crc)
lttng_ust_field_string(filename, filename)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint32_t, crc, crc)
lttng_ust_field_string(filename, filename)
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
LTTNG_UST_TP_FIELDS(
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
)
)
lttng_ust_field_integer_hex(void *, baddr, baddr)
)
)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
+ lttng_ust_field_unused(ip)
LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, ptr, ptr)
LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, ptr, ptr)
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer(size_t, nmemb, nmemb)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
lttng_ust_field_integer(size_t, nmemb, nmemb)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, in_ptr, in_ptr)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
lttng_ust_field_integer_hex(void *, in_ptr, in_ptr)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer(size_t, alignment, alignment)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
lttng_ust_field_integer(size_t, alignment, alignment)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer_hex(void *, ptr, ptr)
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer(size_t, alignment, alignment)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer(int, result, result)
lttng_ust_field_integer(size_t, alignment, alignment)
lttng_ust_field_integer(size_t, size, size)
lttng_ust_field_integer(int, result, result)
+ lttng_ust_field_unused(ip)
LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
+ lttng_ust_field_unused(ip)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
lttng_ust_field_integer(int, status, status)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
lttng_ust_field_integer(int, status, status)
+ lttng_ust_field_unused(ip)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
lttng_ust_field_integer(int, status, status)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
lttng_ust_field_integer(int, status, status)
+ lttng_ust_field_unused(ip)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
lttng_ust_field_integer(int, status, status)
LTTNG_UST_TP_FIELDS(
lttng_ust_field_integer_hex(void *, mutex, mutex)
lttng_ust_field_integer(int, status, status)
+ lttng_ust_field_unused(ip)
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, start,
LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
LTTNG_UST_TP_FIELDS(
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, start,
LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(session)
uint8_t, has_debug_link
),
LTTNG_UST_TP_FIELDS(
uint8_t, has_debug_link
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(session)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_string(path, path)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_string(path, path)
size_t, build_id_len
),
LTTNG_UST_TP_FIELDS(
size_t, build_id_len
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(session)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
size_t, build_id_len)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
size_t, build_id_len)
uint32_t, crc
),
LTTNG_UST_TP_FIELDS(
uint32_t, crc
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(session)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint32_t, crc, crc)
lttng_ust_field_string(filename, filename)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint32_t, crc, crc)
lttng_ust_field_string(filename, filename)
char *, name
),
LTTNG_UST_TP_FIELDS(
char *, name
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(session)
lttng_ust_field_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
)
)
lttng_ust_field_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
)
)
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
LTTNG_UST_TP_FIELDS(
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(session)
uint64_t, memsz, uint8_t, has_build_id,
uint8_t, has_debug_link),
LTTNG_UST_TP_FIELDS(
uint64_t, memsz, uint8_t, has_build_id,
uint8_t, has_debug_link),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_string(path, path)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint64_t, memsz, memsz)
lttng_ust_field_string(path, path)
size_t, build_id_len
),
LTTNG_UST_TP_FIELDS(
size_t, build_id_len
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
size_t, build_id_len)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
size_t, build_id_len)
uint32_t, crc
),
LTTNG_UST_TP_FIELDS(
uint32_t, crc
),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint32_t, crc, crc)
lttng_ust_field_string(filename, filename)
lttng_ust_field_integer_hex(void *, baddr, baddr)
lttng_ust_field_integer(uint32_t, crc, crc)
lttng_ust_field_string(filename, filename)
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, unload,
LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
LTTNG_UST_TP_FIELDS(
LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, unload,
LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
LTTNG_UST_TP_FIELDS(
+ lttng_ust_field_unused(ip)
lttng_ust_field_integer_hex(void *, baddr, baddr)
)
)
lttng_ust_field_integer_hex(void *, baddr, baddr)
)
)