X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fctf-types%2Fust_tests_ctf_types.h;h=489f04a204d05146059477f6a6187eee7357afe7;hb=a0f2513af262a19822d46f84cd5e34be0badc484;hp=e789cbe0bcc5b62a77d2f1557abcc9aff5c0e290;hpb=dbe6ade0ba17270b2cb119b9961bbb7e48ce4733;p=lttng-ust.git diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h index e789cbe0..489f04a2 100644 --- a/tests/compile/ctf-types/ust_tests_ctf_types.h +++ b/tests/compile/ctf-types/ust_tests_ctf_types.h @@ -1,47 +1,31 @@ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_ctf_types - -#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(TRACEPOINT_HEADER_MULTI_READ) -#define _TRACEPOINT_UST_TESTS_CTF_TYPES_H - /* - * Copyright (C) 2014 Geneviève Bastien - * - * 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: + * SPDX-License-Identifier: MIT * - * 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. + * Copyright (C) 2014 Geneviève Bastien */ +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_ctf_types + +#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) +#define _TRACEPOINT_UST_TESTS_CTF_TYPES_H + #include -TRACEPOINT_ENUM(ust_tests_ctf_types, testenum, - TP_ENUM_VALUES( - ctf_enum_value("even", 0) - ctf_enum_value("uneven", 1) - ctf_enum_range("twoto4", 2, 4) - ctf_enum_value("five\"extra\\test", 5) +LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum, + LTTNG_UST_TP_ENUM_VALUES( + lttng_ust_field_enum_value("even", 0) + lttng_ust_field_enum_value("uneven", 1) + lttng_ust_field_enum_range("twoto4", 2, 4) + lttng_ust_field_enum_value("five\"extra\\test", 5) ) ) -TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2, - TP_ENUM_VALUES( - ctf_enum_value("zero", 0) - ctf_enum_value("five", 5) - ctf_enum_range("ten_to_twenty", 10, 20) +LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2, + LTTNG_UST_TP_ENUM_VALUES( + lttng_ust_field_enum_value("zero", 0) + lttng_ust_field_enum_value("five", 5) + lttng_ust_field_enum_range("ten_to_twenty", 10, 20) ) ) @@ -49,14 +33,14 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2, * Enumeration field is used twice to make sure the type declaration * is entered only once in the metadata file. */ -TRACEPOINT_EVENT(ust_tests_ctf_types, tptest, - TP_ARGS(int, anint, int, enumval, int, enumval2), - TP_FIELDS( - ctf_integer(int, intfield, anint) - ctf_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval) - ctf_enum(ust_tests_ctf_types, testenum, long long, +LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest, + LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2), + LTTNG_UST_TP_FIELDS( + lttng_ust_field_integer(int, intfield, anint) + lttng_ust_field_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval) + lttng_ust_field_enum(ust_tests_ctf_types, testenum, long long, enumfield_bis, enumval) - ctf_enum(ust_tests_ctf_types, testenum2, unsigned int, + lttng_ust_field_enum(ust_tests_ctf_types, testenum2, unsigned int, enumfield_third, enumval2) ) ) @@ -65,19 +49,19 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest, * Another tracepoint using the types to make sure each type is entered * only once in the metadata file. */ -TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis, - TP_ARGS(int, anint, int, enumval), - TP_FIELDS( - ctf_integer(int, intfield, anint) - ctf_enum(ust_tests_ctf_types, testenum, unsigned char, +LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis, + LTTNG_UST_TP_ARGS(int, anint, int, enumval), + LTTNG_UST_TP_FIELDS( + lttng_ust_field_integer(int, intfield, anint) + lttng_ust_field_enum(ust_tests_ctf_types, testenum, unsigned char, enumfield, enumval) ) ) #endif /* _TRACEPOINT_UST_TESTS_CTF_TYPES_H */ -#undef TRACEPOINT_INCLUDE -#define TRACEPOINT_INCLUDE "./ust_tests_ctf_types.h" +#undef LTTNG_UST_TRACEPOINT_INCLUDE +#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_ctf_types.h" /* This part must be outside ifdef protection */ #include