Fix: pass private data to context callbacks

[lttng-ust.git] / liblttng-ust-dl / ust_dl.h

diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
index 72b23ac58eea522f6f8466e1c80c34608a600c68..7f618da778518998927b856f4a02b0ca9dff0531 100644 (file)
--- a/liblttng-ust-dl/ust_dl.h
+++ b/liblttng-ust-dl/ust_dl.h
@@ -1,3 +1,10 @@
+/*
+ * 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
 
@@ -8,29 +15,7 @@
 extern "C" {
 #endif
 
-/*
- * Copyright (C) 2013  Paul Woegerer <paul_woegerer@mentor.com>
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
+#include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
 
@@ -38,15 +23,39 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
-       TP_ARGS(void *, ip, void *, baddr, const char*, path,
-               uint64_t, memsz),
+       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,
@@ -55,6 +64,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, 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)
@@ -69,6 +79,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
                uint32_t, crc
        ),
        TP_FIELDS(
+               ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint32_t, crc, crc)
                ctf_string(filename, filename)
@@ -78,6 +89,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
 TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
        TP_ARGS(void *, ip, void *, baddr),
        TP_FIELDS(
+               ctf_unused(ip)
                ctf_integer_hex(void *, baddr, baddr)
        )
 )