X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=a8ee06beb459e8400e462ac1a97b677ff175d3f5;hb=4199ddc7eb37386241633a0dd65a5305ec97cb15;hp=bcab5e2d7b0fa3c2ac0efb71b2c4f2ed3a68f2fe;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index bcab5e2d..a8ee06be 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -15,8 +15,10 @@
 #include <urcu/system.h>
 #include <dlfcn.h>	/* for dlopen */
 #include <string.h>	/* for memset */
+
 #include <lttng/ust-config.h>	/* for sdt */
 #include <lttng/ust-compiler.h>
+#include <lttng/ust-tracer.h>
 
 #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
 /*
@@ -210,8 +212,18 @@ extern int __tracepoint_probe_unregister(const char *name, void (*func)(void),
 /*
  * tracepoint dynamic linkage handling (callbacks). Hidden visibility:
  * shared across objects in a module/main executable.
+ *
+ * IMPORTANT: this structure is part of the ABI between instrumented
+ * applications and UST. Fields need to be only added at the end, never
+ * reordered, never removed.
+ *
+ * The field @struct_size should be used to determine the size of the
+ * structure. It should be queried before using additional fields added
+ * at the end of the structure.
  */
 struct lttng_ust_tracepoint_dlopen {
+	uint32_t struct_size;
+
 	void *liblttngust_handle;
 
 	int (*tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
@@ -220,6 +232,8 @@ struct lttng_ust_tracepoint_dlopen {
 	void (*rcu_read_lock_sym)(void);
 	void (*rcu_read_unlock_sym)(void);
 	void *(*rcu_dereference_sym)(void *p);
+
+	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
 extern struct lttng_ust_tracepoint_dlopen tracepoint_dlopen;
@@ -235,7 +249,9 @@ int __tracepoint_registered
 int __tracepoint_ptrs_registered
 	__attribute__((weak, visibility("hidden")));
 struct lttng_ust_tracepoint_dlopen tracepoint_dlopen
-	__attribute__((weak, visibility("hidden")));
+		__attribute__((weak, visibility("hidden"))) = {
+	.struct_size = sizeof(struct lttng_ust_tracepoint_dlopen),
+};
 /*
  * Deal with gcc O1 optimisation issues with weak hidden symbols. gcc
  * 4.8 and prior does not have the same behavior for symbol scoping on
@@ -253,17 +269,31 @@ struct lttng_ust_tracepoint_dlopen *tracepoint_dlopen_ptr
  * Tracepoint dynamic linkage handling (callbacks). Hidden visibility: shared
  * across objects in a module/main executable. The callbacks are used to
  * control and check if the destructors should be executed.
+ *
+ * IMPORTANT: this structure is part of the ABI between instrumented
+ * applications and UST. Fields need to be only added at the end, never
+ * reordered, never removed.
+ *
+ * The field @struct_size should be used to determine the size of the
+ * structure. It should be queried before using additional fields added
+ * at the end of the structure.
  */
 struct lttng_ust_tracepoint_destructors_syms {
+	uint32_t struct_size;
+
 	void (*tracepoint_disable_destructors)(void);
 	int (*tracepoint_get_destructors_state)(void);
+
+	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
 extern struct lttng_ust_tracepoint_destructors_syms tracepoint_destructors_syms;
 extern struct lttng_ust_tracepoint_destructors_syms *tracepoint_destructors_syms_ptr;
 
 struct lttng_ust_tracepoint_destructors_syms tracepoint_destructors_syms
-	__attribute__((weak, visibility("hidden")));
+	__attribute__((weak, visibility("hidden"))) = {
+	.struct_size = sizeof(struct lttng_ust_tracepoint_destructors_syms),
+};
 struct lttng_ust_tracepoint_destructors_syms *tracepoint_destructors_syms_ptr
 	__attribute__((weak, visibility("hidden")));
 
@@ -331,7 +361,7 @@ __tracepoints__init(void)
 		tracepoint_dlopen_ptr = &tracepoint_dlopen;
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		tracepoint_dlopen_ptr->liblttngust_handle =
-			dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
+			dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		return;
 	__tracepoint__init_urcu_sym();
@@ -414,14 +444,13 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[]
 		__attribute__((section("__tracepoints_strings"))) =		\
 			#_provider ":" #_name;					\
 	struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name	\
-		__attribute__((section("__tracepoints"))) =			\
-		{								\
+		__attribute__((section("__tracepoints"))) = {			\
+			sizeof(struct lttng_ust_tracepoint),			\
 			__tp_strtab_##_provider##___##_name,			\
 			0,							\
 			NULL,							\
 			_TRACEPOINT_UNDEFINED_REF(_provider), 			\
 			_TP_EXTRACT_STRING(_args),				\
-			{ },							\
 		};								\
 	static struct lttng_ust_tracepoint *					\
 		__tracepoint_ptr_##_provider##___##_name			\
@@ -440,7 +469,7 @@ __tracepoints__ptrs_init(void)
 		tracepoint_dlopen_ptr = &tracepoint_dlopen;
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		tracepoint_dlopen_ptr->liblttngust_handle =
-			dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
+			dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
 	if (!tracepoint_dlopen_ptr->liblttngust_handle)
 		return;
 	if (!tracepoint_destructors_syms_ptr)