X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-types.h;h=42fe948657613d61c7df9db596abb023662287ad;hb=9b14815a9ee98c0dbc842a1e545cd6a82ae7b18a;hp=ee1cd78daba67274c1d82bb5d321240ed454bb95;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-types.h b/include/lttng/tracepoint-types.h
index ee1cd78d..42fe9486 100644
--- a/include/lttng/tracepoint-types.h
+++ b/include/lttng/tracepoint-types.h
@@ -1,33 +1,51 @@
-#ifndef _LTTNG_TRACEPOINT_TYPES_H
-#define _LTTNG_TRACEPOINT_TYPES_H
-
 /*
- * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * 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:
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _LTTNG_UST_TRACEPOINT_TYPES_H
+#define _LTTNG_UST_TRACEPOINT_TYPES_H
+
+#include <stdint.h>
+
+/*
+ * Tracepoint probe definition
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * IMPORTANT: this structure is part of the ABI between instrumented
+ * applications and UST. This structure is fixed-size because it is part
+ * of a public array of structures. Rather than extending this
+ * structure, struct lttng_ust_tracepoint should be extended instead.
  */
 
-struct tracepoint_probe {
-	void *func;
+struct lttng_ust_tracepoint_probe {
+	void (*func)(void);
 	void *data;
 };
 
-#define TRACEPOINT_PADDING	16
-struct tracepoint {
-	const char *name;
+/*
+ * Tracepoint definition
+ *
+ * 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 {
+	uint32_t struct_size;
+
+	const char *provider_name;
+	const char *event_name;
 	int state;
-	struct tracepoint_probe *probes;
+	struct lttng_ust_tracepoint_probe *probes;
 	int *tracepoint_provider_ref;
 	const char *signature;
-	char padding[TRACEPOINT_PADDING];
+
+	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-#endif /* _LTTNG_TRACEPOINT_TYPES_H */
+#endif /* _LTTNG_UST_TRACEPOINT_TYPES_H */