Move all public libraries under 'src/lib/'.
This is part of an effort to standardize our autotools setup across
projects to simplify maintenance.
Change-Id: I1e6a0597ed9ea79f661393a48f149a982f360d1d
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
/src/liblttng-ust-comm/Makefile
/src/liblttng-ust-ctl/Makefile
/src/lib/lttng-ust-cyg-profile/Makefile
-/src/liblttng-ust-dl/Makefile
+/src/lib/lttng-ust-dl/Makefile
/src/lib/lttng-ust-fd/Makefile
/src/lib/lttng-ust-fork/Makefile
/src/liblttng-ust-java-agent/Makefile
src/liblttng-ust-comm/Makefile
src/liblttng-ust-ctl/Makefile
src/lib/lttng-ust-cyg-profile/Makefile
- src/liblttng-ust-dl/Makefile
+ src/lib/lttng-ust-dl/Makefile
src/lib/lttng-ust-fd/Makefile
src/lib/lttng-ust-fork/Makefile
src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
liblttng-ust-ctl \
lib
-if ENABLE_UST_DL
-SUBDIRS += liblttng-ust-dl
-endif
-
if ENABLE_JNI_INTERFACE
SUBDIRS += liblttng-ust-java
endif
lttng-ust-cyg-profile \
lttng-ust-libc-wrapper
+if ENABLE_UST_DL
+SUBDIRS += lttng-ust-dl
+endif
+
if ENABLE_PYTHON_AGENT
SUBDIRS += lttng-ust-python-agent
endif
--- /dev/null
+# SPDX-License-Identifier: LGPL-2.1-only
+
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
+
+lib_LTLIBRARIES = liblttng-ust-dl.la
+liblttng_ust_dl_la_SOURCES = \
+ lttng-ust-dl.c \
+ ust_dl.c \
+ ust_dl.h
+
+liblttng_ust_dl_la_LIBADD = \
+ $(top_builddir)/src/liblttng-ust/liblttng-ust.la \
+ $(top_builddir)/src/common/libcommon.la \
+ $(DL_LIBS)
+
+liblttng_ust_dl_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-dl $(AM_CFLAGS)
+liblttng_ust_dl_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION)
--- /dev/null
+/*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (C) 2013 Paul Woegerer <paul.woegerer@mentor.com>
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#define _LGPL_SOURCE
+
+/* Has to be included first to override dlfcn.h */
+#include <common/compat/dlfcn.h>
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "common/elf.h"
+#include <lttng/ust-events.h>
+#include "common/macros.h"
+#include "common/logging.h"
+
+#include "liblttng-ust/ust-events-internal.h"
+
+/* Include link.h last else it conflicts with ust-dlfcn. */
+#include <link.h>
+
+#define TRACEPOINT_DEFINE
+#include "ust_dl.h"
+
+static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
+#ifdef HAVE_DLMOPEN
+static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
+ int flags);
+#endif
+static int (*__lttng_ust_plibc_dlclose)(void *handle);
+
+static
+void _lttng_ust_dl_init(void)
+ __attribute__((constructor));
+static
+void _lttng_ust_dl_init(void)
+{
+ ust_err_init();
+}
+
+static
+void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
+{
+ if (!__lttng_ust_plibc_dlopen) {
+ __lttng_ust_plibc_dlopen = dlsym(RTLD_NEXT, "dlopen");
+ if (!__lttng_ust_plibc_dlopen) {
+ fprintf(stderr, "%s\n", dlerror());
+ return NULL;
+ }
+ }
+ return __lttng_ust_plibc_dlopen(filename, flags);
+}
+
+#ifdef HAVE_DLMOPEN
+static
+void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
+ int flags)
+{
+ if (!__lttng_ust_plibc_dlmopen) {
+ __lttng_ust_plibc_dlmopen = dlsym(RTLD_NEXT, "dlmopen");
+ if (!__lttng_ust_plibc_dlmopen) {
+ fprintf(stderr, "%s\n", dlerror());
+ return NULL;
+ }
+ }
+ return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
+}
+#endif
+
+static
+int _lttng_ust_dl_libc_dlclose(void *handle)
+{
+ if (!__lttng_ust_plibc_dlclose) {
+ __lttng_ust_plibc_dlclose = dlsym(RTLD_NEXT, "dlclose");
+ if (!__lttng_ust_plibc_dlclose) {
+ fprintf(stderr, "%s\n", dlerror());
+ return -1;
+ }
+ }
+ return __lttng_ust_plibc_dlclose(handle);
+}
+
+static
+void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
+ int flags, void *ip)
+{
+ char resolved_path[PATH_MAX];
+ struct lttng_ust_elf *elf;
+ uint64_t memsz;
+ uint8_t *build_id = NULL;
+ size_t build_id_len;
+ char *dbg_file = NULL;
+ uint32_t crc;
+ int has_build_id = 0, has_debug_link = 0;
+ int ret;
+
+ if (!realpath(so_name, resolved_path)) {
+ ERR("could not resolve path '%s'", so_name);
+ return;
+ }
+
+ elf = lttng_ust_elf_create(resolved_path);
+ if (!elf) {
+ ERR("could not access file %s", resolved_path);
+ return;
+ }
+
+ ret = lttng_ust_elf_get_memsz(elf, &memsz);
+ if (ret) {
+ goto end;
+ }
+ ret = lttng_ust_elf_get_build_id(
+ elf, &build_id, &build_id_len, &has_build_id);
+ if (ret) {
+ goto end;
+ }
+ ret = lttng_ust_elf_get_debug_link(
+ elf, &dbg_file, &crc, &has_debug_link);
+ if (ret) {
+ goto end;
+ }
+
+ tracepoint(lttng_ust_dl, dlopen,
+ ip, so_base, resolved_path, flags, memsz,
+ has_build_id, has_debug_link);
+
+ if (has_build_id) {
+ tracepoint(lttng_ust_dl, build_id,
+ ip, so_base, build_id, build_id_len);
+ }
+
+ if (has_debug_link) {
+ tracepoint(lttng_ust_dl, debug_link,
+ ip, so_base, dbg_file, crc);
+ }
+
+end:
+ free(dbg_file);
+ free(build_id);
+ lttng_ust_elf_destroy(elf);
+ return;
+}
+
+#ifdef HAVE_DLMOPEN
+static
+void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
+ int flags, void *ip)
+{
+ char resolved_path[PATH_MAX];
+ struct lttng_ust_elf *elf;
+ uint64_t memsz;
+ uint8_t *build_id = NULL;
+ size_t build_id_len;
+ char *dbg_file = NULL;
+ uint32_t crc;
+ int has_build_id = 0, has_debug_link = 0;
+ int ret;
+
+ if (!realpath(so_name, resolved_path)) {
+ ERR("could not resolve path '%s'", so_name);
+ return;
+ }
+
+ elf = lttng_ust_elf_create(resolved_path);
+ if (!elf) {
+ ERR("could not access file %s", resolved_path);
+ return;
+ }
+
+ ret = lttng_ust_elf_get_memsz(elf, &memsz);
+ if (ret) {
+ goto end;
+ }
+ ret = lttng_ust_elf_get_build_id(
+ elf, &build_id, &build_id_len, &has_build_id);
+ if (ret) {
+ goto end;
+ }
+ ret = lttng_ust_elf_get_debug_link(
+ elf, &dbg_file, &crc, &has_debug_link);
+ if (ret) {
+ goto end;
+ }
+
+ tracepoint(lttng_ust_dl, dlmopen,
+ ip, so_base, nsid, resolved_path, flags, memsz,
+ has_build_id, has_debug_link);
+
+ if (has_build_id) {
+ tracepoint(lttng_ust_dl, build_id,
+ ip, so_base, build_id, build_id_len);
+ }
+
+ if (has_debug_link) {
+ tracepoint(lttng_ust_dl, debug_link,
+ ip, so_base, dbg_file, crc);
+ }
+
+end:
+ free(dbg_file);
+ free(build_id);
+ lttng_ust_elf_destroy(elf);
+ return;
+}
+#endif
+
+void *dlopen(const char *filename, int flags)
+{
+ void *handle;
+
+ handle = _lttng_ust_dl_libc_dlopen(filename, flags);
+ if (__tracepoint_ptrs_registered && handle) {
+ struct link_map *p = NULL;
+ int ret;
+
+ ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
+ if (ret != -1 && p != NULL && p->l_addr != 0) {
+ lttng_ust_dl_dlopen((void *) p->l_addr,
+ p->l_name, flags, LTTNG_UST_CALLER_IP());
+ }
+ }
+ lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
+ return handle;
+}
+
+#ifdef HAVE_DLMOPEN
+void *dlmopen(Lmid_t nsid, const char *filename, int flags)
+{
+ void *handle;
+
+ handle = _lttng_ust_dl_libc_dlmopen(nsid, filename, flags);
+ if (__tracepoint_ptrs_registered && handle) {
+ struct link_map *p = NULL;
+ int ret;
+
+ ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
+ if (ret != -1 && p != NULL && p->l_addr != 0) {
+ lttng_ust_dl_dlmopen((void *) p->l_addr,
+ nsid, p->l_name, flags,
+ LTTNG_UST_CALLER_IP());
+ }
+ }
+ lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
+ return handle;
+
+}
+#endif
+
+int dlclose(void *handle)
+{
+ int ret;
+
+ if (__tracepoint_ptrs_registered) {
+ struct link_map *p = NULL;
+
+ ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
+ if (ret != -1 && p != NULL && p->l_addr != 0) {
+ tracepoint(lttng_ust_dl, dlclose,
+ LTTNG_UST_CALLER_IP(),
+ (void *) p->l_addr);
+ }
+ }
+ ret = _lttng_ust_dl_libc_dlclose(handle);
+ lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
+ return ret;
+}
--- /dev/null
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * Copyright (C) 2013 Paul Woegerer <paul_woegerer@mentor.com>
+ */
+
+#define _LGPL_SOURCE
+#define TRACEPOINT_CREATE_PROBES
+#define TP_IP_PARAM ip
+#include "ust_dl.h"
--- /dev/null
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2013 Paul Woegerer <paul_woegerer@mentor.com>
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER lttng_ust_dl
+
+#if !defined(_TRACEPOINT_UST_DL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_UST_DL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#define LTTNG_UST_DL_PROVIDER
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
+ TP_ARGS(void *, ip, void *, baddr, const char *, path,
+ int, flags, uint64_t, memsz, uint8_t, has_build_id,
+ uint8_t, has_debug_link),
+ TP_FIELDS(
+ ctf_unused(ip)
+ ctf_integer_hex(void *, baddr, baddr)
+ ctf_integer(uint64_t, memsz, memsz)
+ ctf_integer_hex(int, flags, flags)
+ ctf_string(path, path)
+ ctf_integer(uint8_t, has_build_id, has_build_id)
+ ctf_integer(uint8_t, has_debug_link, has_debug_link)
+ )
+)
+
+#ifdef HAVE_DLMOPEN
+TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
+ TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
+ const char *, path, int, flags,
+ uint64_t, memsz, uint8_t, has_build_id,
+ uint8_t, has_debug_link),
+ TP_FIELDS(
+ ctf_unused(ip)
+ ctf_integer_hex(void *, baddr, baddr)
+ ctf_integer(uint64_t, memsz, memsz)
+ ctf_integer(Lmid_t, nsid, nsid)
+ ctf_integer_hex(int, flags, flags)
+ ctf_string(path, path)
+ ctf_integer(uint8_t, has_build_id, has_build_id)
+ ctf_integer(uint8_t, has_debug_link, has_debug_link)
+ )
+)
+#endif
+
+TRACEPOINT_EVENT(lttng_ust_dl, build_id,
+ TP_ARGS(
+ void *, ip,
+ void *, baddr,
+ uint8_t *, build_id,
+ size_t, build_id_len
+ ),
+ TP_FIELDS(
+ ctf_unused(ip)
+ ctf_integer_hex(void *, baddr, baddr)
+ ctf_sequence_hex(uint8_t, build_id, build_id,
+ size_t, build_id_len)
+ )
+)
+
+TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
+ TP_ARGS(
+ void *, ip,
+ void *, baddr,
+ char *, filename,
+ uint32_t, crc
+ ),
+ TP_FIELDS(
+ ctf_unused(ip)
+ ctf_integer_hex(void *, baddr, baddr)
+ ctf_integer(uint32_t, crc, crc)
+ ctf_string(filename, filename)
+ )
+)
+
+TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
+ TP_ARGS(void *, ip, void *, baddr),
+ TP_FIELDS(
+ ctf_unused(ip)
+ ctf_integer_hex(void *, baddr, baddr)
+ )
+)
+
+#endif /* _TRACEPOINT_UST_DL_H */
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_dl.h"
+
+/* This part must be outside ifdef protection */
+#include <lttng/tracepoint-event.h>
+
+#ifdef __cplusplus
+}
+#endif
+++ /dev/null
-# SPDX-License-Identifier: LGPL-2.1-only
-
-AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
-
-lib_LTLIBRARIES = liblttng-ust-dl.la
-liblttng_ust_dl_la_SOURCES = \
- lttng-ust-dl.c \
- ust_dl.c \
- ust_dl.h
-
-liblttng_ust_dl_la_LIBADD = \
- $(top_builddir)/src/liblttng-ust/liblttng-ust.la \
- $(top_builddir)/src/common/libcommon.la \
- $(DL_LIBS)
-
-liblttng_ust_dl_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-dl $(AM_CFLAGS)
-liblttng_ust_dl_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION)
+++ /dev/null
-/*
- * SPDX-License-Identifier: LGPL-2.1-only
- *
- * Copyright (C) 2013 Paul Woegerer <paul.woegerer@mentor.com>
- * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
- * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#define _LGPL_SOURCE
-
-/* Has to be included first to override dlfcn.h */
-#include <common/compat/dlfcn.h>
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "common/elf.h"
-#include <lttng/ust-events.h>
-#include "common/macros.h"
-#include "common/logging.h"
-
-#include "../liblttng-ust/ust-events-internal.h"
-
-/* Include link.h last else it conflicts with ust-dlfcn. */
-#include <link.h>
-
-#define TRACEPOINT_DEFINE
-#include "ust_dl.h"
-
-static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
-#ifdef HAVE_DLMOPEN
-static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
- int flags);
-#endif
-static int (*__lttng_ust_plibc_dlclose)(void *handle);
-
-static
-void _lttng_ust_dl_init(void)
- __attribute__((constructor));
-static
-void _lttng_ust_dl_init(void)
-{
- ust_err_init();
-}
-
-static
-void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
-{
- if (!__lttng_ust_plibc_dlopen) {
- __lttng_ust_plibc_dlopen = dlsym(RTLD_NEXT, "dlopen");
- if (!__lttng_ust_plibc_dlopen) {
- fprintf(stderr, "%s\n", dlerror());
- return NULL;
- }
- }
- return __lttng_ust_plibc_dlopen(filename, flags);
-}
-
-#ifdef HAVE_DLMOPEN
-static
-void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
- int flags)
-{
- if (!__lttng_ust_plibc_dlmopen) {
- __lttng_ust_plibc_dlmopen = dlsym(RTLD_NEXT, "dlmopen");
- if (!__lttng_ust_plibc_dlmopen) {
- fprintf(stderr, "%s\n", dlerror());
- return NULL;
- }
- }
- return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
-}
-#endif
-
-static
-int _lttng_ust_dl_libc_dlclose(void *handle)
-{
- if (!__lttng_ust_plibc_dlclose) {
- __lttng_ust_plibc_dlclose = dlsym(RTLD_NEXT, "dlclose");
- if (!__lttng_ust_plibc_dlclose) {
- fprintf(stderr, "%s\n", dlerror());
- return -1;
- }
- }
- return __lttng_ust_plibc_dlclose(handle);
-}
-
-static
-void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
- int flags, void *ip)
-{
- char resolved_path[PATH_MAX];
- struct lttng_ust_elf *elf;
- uint64_t memsz;
- uint8_t *build_id = NULL;
- size_t build_id_len;
- char *dbg_file = NULL;
- uint32_t crc;
- int has_build_id = 0, has_debug_link = 0;
- int ret;
-
- if (!realpath(so_name, resolved_path)) {
- ERR("could not resolve path '%s'", so_name);
- return;
- }
-
- elf = lttng_ust_elf_create(resolved_path);
- if (!elf) {
- ERR("could not access file %s", resolved_path);
- return;
- }
-
- ret = lttng_ust_elf_get_memsz(elf, &memsz);
- if (ret) {
- goto end;
- }
- ret = lttng_ust_elf_get_build_id(
- elf, &build_id, &build_id_len, &has_build_id);
- if (ret) {
- goto end;
- }
- ret = lttng_ust_elf_get_debug_link(
- elf, &dbg_file, &crc, &has_debug_link);
- if (ret) {
- goto end;
- }
-
- tracepoint(lttng_ust_dl, dlopen,
- ip, so_base, resolved_path, flags, memsz,
- has_build_id, has_debug_link);
-
- if (has_build_id) {
- tracepoint(lttng_ust_dl, build_id,
- ip, so_base, build_id, build_id_len);
- }
-
- if (has_debug_link) {
- tracepoint(lttng_ust_dl, debug_link,
- ip, so_base, dbg_file, crc);
- }
-
-end:
- free(dbg_file);
- free(build_id);
- lttng_ust_elf_destroy(elf);
- return;
-}
-
-#ifdef HAVE_DLMOPEN
-static
-void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
- int flags, void *ip)
-{
- char resolved_path[PATH_MAX];
- struct lttng_ust_elf *elf;
- uint64_t memsz;
- uint8_t *build_id = NULL;
- size_t build_id_len;
- char *dbg_file = NULL;
- uint32_t crc;
- int has_build_id = 0, has_debug_link = 0;
- int ret;
-
- if (!realpath(so_name, resolved_path)) {
- ERR("could not resolve path '%s'", so_name);
- return;
- }
-
- elf = lttng_ust_elf_create(resolved_path);
- if (!elf) {
- ERR("could not access file %s", resolved_path);
- return;
- }
-
- ret = lttng_ust_elf_get_memsz(elf, &memsz);
- if (ret) {
- goto end;
- }
- ret = lttng_ust_elf_get_build_id(
- elf, &build_id, &build_id_len, &has_build_id);
- if (ret) {
- goto end;
- }
- ret = lttng_ust_elf_get_debug_link(
- elf, &dbg_file, &crc, &has_debug_link);
- if (ret) {
- goto end;
- }
-
- tracepoint(lttng_ust_dl, dlmopen,
- ip, so_base, nsid, resolved_path, flags, memsz,
- has_build_id, has_debug_link);
-
- if (has_build_id) {
- tracepoint(lttng_ust_dl, build_id,
- ip, so_base, build_id, build_id_len);
- }
-
- if (has_debug_link) {
- tracepoint(lttng_ust_dl, debug_link,
- ip, so_base, dbg_file, crc);
- }
-
-end:
- free(dbg_file);
- free(build_id);
- lttng_ust_elf_destroy(elf);
- return;
-}
-#endif
-
-void *dlopen(const char *filename, int flags)
-{
- void *handle;
-
- handle = _lttng_ust_dl_libc_dlopen(filename, flags);
- if (__tracepoint_ptrs_registered && handle) {
- struct link_map *p = NULL;
- int ret;
-
- ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
- if (ret != -1 && p != NULL && p->l_addr != 0) {
- lttng_ust_dl_dlopen((void *) p->l_addr,
- p->l_name, flags, LTTNG_UST_CALLER_IP());
- }
- }
- lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
- return handle;
-}
-
-#ifdef HAVE_DLMOPEN
-void *dlmopen(Lmid_t nsid, const char *filename, int flags)
-{
- void *handle;
-
- handle = _lttng_ust_dl_libc_dlmopen(nsid, filename, flags);
- if (__tracepoint_ptrs_registered && handle) {
- struct link_map *p = NULL;
- int ret;
-
- ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
- if (ret != -1 && p != NULL && p->l_addr != 0) {
- lttng_ust_dl_dlmopen((void *) p->l_addr,
- nsid, p->l_name, flags,
- LTTNG_UST_CALLER_IP());
- }
- }
- lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
- return handle;
-
-}
-#endif
-
-int dlclose(void *handle)
-{
- int ret;
-
- if (__tracepoint_ptrs_registered) {
- struct link_map *p = NULL;
-
- ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
- if (ret != -1 && p != NULL && p->l_addr != 0) {
- tracepoint(lttng_ust_dl, dlclose,
- LTTNG_UST_CALLER_IP(),
- (void *) p->l_addr);
- }
- }
- ret = _lttng_ust_dl_libc_dlclose(handle);
- lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
- return ret;
-}
+++ /dev/null
-/*
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * Copyright (C) 2013 Paul Woegerer <paul_woegerer@mentor.com>
- */
-
-#define _LGPL_SOURCE
-#define TRACEPOINT_CREATE_PROBES
-#define TP_IP_PARAM ip
-#include "ust_dl.h"
+++ /dev/null
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2013 Paul Woegerer <paul_woegerer@mentor.com>
- * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
- */
-
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_dl
-
-#if !defined(_TRACEPOINT_UST_DL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_DL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#define LTTNG_UST_DL_PROVIDER
-#include <lttng/tracepoint.h>
-
-TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
- TP_ARGS(void *, ip, void *, baddr, const char *, path,
- int, flags, uint64_t, memsz, uint8_t, has_build_id,
- uint8_t, has_debug_link),
- TP_FIELDS(
- ctf_unused(ip)
- ctf_integer_hex(void *, baddr, baddr)
- ctf_integer(uint64_t, memsz, memsz)
- ctf_integer_hex(int, flags, flags)
- ctf_string(path, path)
- ctf_integer(uint8_t, has_build_id, has_build_id)
- ctf_integer(uint8_t, has_debug_link, has_debug_link)
- )
-)
-
-#ifdef HAVE_DLMOPEN
-TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
- TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
- const char *, path, int, flags,
- uint64_t, memsz, uint8_t, has_build_id,
- uint8_t, has_debug_link),
- TP_FIELDS(
- ctf_unused(ip)
- ctf_integer_hex(void *, baddr, baddr)
- ctf_integer(uint64_t, memsz, memsz)
- ctf_integer(Lmid_t, nsid, nsid)
- ctf_integer_hex(int, flags, flags)
- ctf_string(path, path)
- ctf_integer(uint8_t, has_build_id, has_build_id)
- ctf_integer(uint8_t, has_debug_link, has_debug_link)
- )
-)
-#endif
-
-TRACEPOINT_EVENT(lttng_ust_dl, build_id,
- TP_ARGS(
- void *, ip,
- void *, baddr,
- uint8_t *, build_id,
- size_t, build_id_len
- ),
- TP_FIELDS(
- ctf_unused(ip)
- ctf_integer_hex(void *, baddr, baddr)
- ctf_sequence_hex(uint8_t, build_id, build_id,
- size_t, build_id_len)
- )
-)
-
-TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
- TP_ARGS(
- void *, ip,
- void *, baddr,
- char *, filename,
- uint32_t, crc
- ),
- TP_FIELDS(
- ctf_unused(ip)
- ctf_integer_hex(void *, baddr, baddr)
- ctf_integer(uint32_t, crc, crc)
- ctf_string(filename, filename)
- )
-)
-
-TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
- TP_ARGS(void *, ip, void *, baddr),
- TP_FIELDS(
- ctf_unused(ip)
- ctf_integer_hex(void *, baddr, baddr)
- )
-)
-
-#endif /* _TRACEPOINT_UST_DL_H */
-
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_dl.h"
-
-/* This part must be outside ifdef protection */
-#include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif
projects / lttng-ust.git / commitdiff
