Fix ABI: add padding to tracepoint and ring buffer config public structures

[lttng-ust.git] / include / lttng / tracepoint-types.h

diff --git a/include/lttng/tracepoint-types.h b/include/lttng/tracepoint-types.h
index 5f3870868d80e847d77b19c15661c9d3089c981a..77e2e25d1621bce2d4dacf2582a47d0f5e18c7a2 100644 (file)
--- a/include/lttng/tracepoint-types.h
+++ b/include/lttng/tracepoint-types.h
@@ -2,44 +2,30 @@
 #define _LTTNG_TRACEPOINT_TYPES_H
 
 /*
- * Copyright (C) 2008-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * Copyright (C) 2009 Pierre-Marc Fournier
- * Copyright (C) 2009 Steven Rostedt <rostedt@goodmis.org>
+ * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * Heavily inspired from the Linux Kernel Markers.
+ * 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.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct tracepoint_probe {
        void *func;
        void *data;
 };
 
+#define TRACEPOINT_PADDING     16
 struct tracepoint {
-       const char *name;               /* Tracepoint name */
-       char state;                     /* State. */
+       const char *name;
+       int state;
        struct tracepoint_probe *probes;
+       int *tracepoint_provider_ref;
+       char padding[TRACEPOINT_PADDING];
 };
 
-#ifdef __cplusplus 
-}
-#endif
-
 #endif /* _LTTNG_TRACEPOINT_TYPES_H */