X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-types.h;h=f54e30aaa66d3293231c8a306bc54206f5d310d3;hb=1a20609484df56e378318d65f07f39dcd8ec1db2;hp=fad23bc488924ed2929730b118c0c17f2a57e67d;hpb=b728d87e617189fe9898a9492a559ecf949d2348;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-types.h b/include/lttng/tracepoint-types.h
index fad23bc4..f54e30aa 100644
--- a/include/lttng/tracepoint-types.h
+++ b/include/lttng/tracepoint-types.h
@@ -2,33 +2,40 @@
 #define _LTTNG_TRACEPOINT_TYPES_H
 
 /*
- * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * 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:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * 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.
  */
 
-struct tracepoint_probe {
-	void *callback;
-	void *priv;
+struct lttng_ust_tracepoint_probe {
+	void (*func)(void);
+	void *data;
 };
 
-struct tracepoint {
+#define LTTNG_UST_TRACEPOINT_PADDING	16
+struct lttng_ust_tracepoint {
 	const char *name;
 	int state;
-	struct tracepoint_probe *probes;
-};
-
-struct tracepoint_lib {
-	struct cds_list_head list;
-	struct tracepoint tracepoints_start;
-	int tracepoints_count;
+	struct lttng_ust_tracepoint_probe *probes;
+	int *tracepoint_provider_ref;
+	const char *signature;
+	char padding[LTTNG_UST_TRACEPOINT_PADDING];
 };
 
 #endif /* _LTTNG_TRACEPOINT_TYPES_H */