-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_tests_hello
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER ust_tests_hello
#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_HELLO_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/*
* 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.
+ * 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:
*
- * 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.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*
- * 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
+ * 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.
*/
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
+#include <stdbool.h>
+#include <stddef.h>
-TRACEPOINT_EVENT(ust_tests_hello_tptest,
- TP_PROTO(int anint, long *values,
- char *text, size_t textlen,
- double doublearg, float floatarg),
- TP_ARGS(anint, values, text, textlen,
- doublearg, floatarg),
+TRACEPOINT_EVENT(ust_tests_hello, tptest,
+ TP_ARGS(int, anint, int, netint, long *, values,
+ char *, text, size_t, textlen,
+ double, doublearg, float, floatarg,
+ bool, boolarg),
TP_FIELDS(
ctf_integer(int, intfield, anint)
ctf_integer_hex(int, intfield2, anint)
- ctf_integer_network(int, intfield3, anint)
- ctf_integer_network_hex(int, intfield4, anint)
+ ctf_integer(long, longfield, anint)
+ ctf_integer_network(int, netintfield, netint)
+ ctf_integer_network_hex(int, netintfieldhex, netint)
+ ctf_array_nowrite(long, arrfield1z, values, 3)
+ ctf_array(long, blah, values, 3)
ctf_array(long, arrfield1, values, 3)
+ ctf_array_hex(long, arrfield1_hex, values, 3)
+ ctf_array_network(long, arrfield1_network, values, 3)
+ ctf_array_network_hex(long, arrfield1_network_hex, values, 3)
ctf_array_text(char, arrfield2, text, 10)
ctf_sequence(char, seqfield1, text,
size_t, textlen)
+ ctf_sequence_nowrite(char, seqfield1z, text,
+ size_t, textlen)
+ ctf_sequence_hex(char, seqfield1_hex, text,
+ size_t, textlen)
ctf_sequence_text(char, seqfield2, text,
size_t, textlen)
+ ctf_sequence_network(long, seqfield_network_3, values,
+ size_t, 3)
ctf_string(stringfield, text)
ctf_float(float, floatfield, floatarg)
ctf_float(double, doublefield, doublearg)
+ ctf_integer(bool, boolfield, boolarg)
+ ctf_integer_nowrite(int, filterfield, anint)
)
)
-TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
+TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+ TP_ARGS(),
TP_FIELDS()
)
#endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_tests_hello
-
-/* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
-#ifdef __cplusplus
-}
-#endif
+/* This part must be outside ifdef protection */
+#include <lttng/tracepoint-event.h>