X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-dl%2Fust_dl.h;h=0ea21266ecaff3d885487aa6d67380f93ff58db8;hb=09434f96935202d1e6cf64a74d4da4b95d06246d;hp=10801898807623d6248067b5a8419fc692144699;hpb=6d4658aa879ddabdd79fc6c637ee039413ad215b;p=lttng-ust.git

diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
index 10801898..0ea21266 100644
--- a/liblttng-ust-dl/ust_dl.h
+++ b/liblttng-ust-dl/ust_dl.h
@@ -10,6 +10,7 @@ extern "C" {
 
 /*
  * 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
@@ -30,24 +31,76 @@ extern "C" {
  * SOFTWARE.
  */
 
+#include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
+#include <config.h>
 
 #define LTTNG_UST_DL_PROVIDER
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
-	TP_ARGS(void *, baddr, const char*, sopath, int64_t, size, int64_t, mtime),
+	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_integer_hex(void *, baddr, baddr)
-		ctf_string(sopath, sopath)
-		ctf_integer(int64_t, size, size)
-		ctf_integer(int64_t, mtime, mtime)
+		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_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_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_integer_hex(void *, baddr, baddr)
+		ctf_integer(uint32_t, crc, crc)
+		ctf_string(filename, filename)
 	)
 )
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
-	TP_ARGS(void *, baddr),
+	TP_ARGS(void *, ip, void *, baddr),
 	TP_FIELDS(
 		ctf_integer_hex(void *, baddr, baddr)
 	)