X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftype-declarations%2Fust_tests_td.h;fp=tests%2Fregression%2Fust%2Ftype-declarations%2Fust_tests_td.h;h=8551b328df106deeb0a982e070fc5b93e11d6dfc;hp=84a8f7c32a81dfd6dca2dfe7b3abd35eaf6c79e2;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hpb=f250b40e2179eccdb83766bf4abef5a35036c47b diff --git a/tests/regression/ust/type-declarations/ust_tests_td.h b/tests/regression/ust/type-declarations/ust_tests_td.h index 84a8f7c32..8551b328d 100644 --- a/tests/regression/ust/type-declarations/ust_tests_td.h +++ b/tests/regression/ust/type-declarations/ust_tests_td.h @@ -13,71 +13,54 @@ #include -TRACEPOINT_ENUM(ust_tests_td, testenum, - TP_ENUM_VALUES( - ctf_enum_value("zero", 0) - ctf_enum_value("one", 1) - ) -) +TRACEPOINT_ENUM(ust_tests_td, + testenum, + TP_ENUM_VALUES(ctf_enum_value("zero", 0) ctf_enum_value("one", 1))) -TRACEPOINT_ENUM(ust_tests_td, testenum2, - TP_ENUM_VALUES( - ctf_enum_value("zero", 0) - ctf_enum_value("five", 5) - ctf_enum_range("ten_to_twenty", 10, 20) - ) -) +TRACEPOINT_ENUM(ust_tests_td, + testenum2, + TP_ENUM_VALUES(ctf_enum_value("zero", 0) ctf_enum_value("five", 5) + ctf_enum_range("ten_to_twenty", 10, 20))) -TRACEPOINT_ENUM(ust_tests_td, testenum3, - TP_ENUM_VALUES( - ctf_enum_auto("zero") - ctf_enum_value("two", 2) - ctf_enum_auto("three") - ctf_enum_range("ten_to_twenty", 10, 20) - ctf_enum_auto("twenty_one") - ) -) +TRACEPOINT_ENUM(ust_tests_td, + testenum3, + TP_ENUM_VALUES(ctf_enum_auto("zero") ctf_enum_value("two", 2) ctf_enum_auto("three") + ctf_enum_range("ten_to_twenty", 10, 20) + ctf_enum_auto("twenty_one"))) /* * Enumeration field is used twice to make sure the global type declaration * is entered only once in the metadata file. */ -TRACEPOINT_EVENT(ust_tests_td, tptest, +TRACEPOINT_EVENT( + ust_tests_td, + tptest, TP_ARGS(int, enumval, int, enumval2, int, enumval3), TP_FIELDS( - ctf_enum(ust_tests_td, testenum, int, enumfield, enumval) - ctf_enum(ust_tests_td, testenum, long long, - enumfield_bis, enumval2) - ctf_enum(ust_tests_td, testenum2, unsigned int, - enumfield_third, enumval3) - ) -) + ctf_enum(ust_tests_td, testenum, int, enumfield, enumval) ctf_enum( + ust_tests_td, testenum, long long, enumfield_bis, enumval2) + ctf_enum(ust_tests_td, testenum2, unsigned int, enumfield_third, enumval3))) /* * Another tracepoint using the global types to make sure each global type is * entered only once in the metadata file. */ -TRACEPOINT_EVENT(ust_tests_td, tptest_bis, - TP_ARGS(int, enumval), - TP_FIELDS( - ctf_enum(ust_tests_td, testenum, unsigned char, - enumfield, enumval) - ) -) +TRACEPOINT_EVENT(ust_tests_td, + tptest_bis, + TP_ARGS(int, enumval), + TP_FIELDS(ctf_enum(ust_tests_td, testenum, unsigned char, enumfield, enumval))) /* * Test autoincrementing enumeration values. */ -TRACEPOINT_EVENT(ust_tests_td, test_auto, - TP_ARGS(void), - TP_FIELDS( - ctf_enum(ust_tests_td, testenum3, int, zero, 0) - ctf_enum(ust_tests_td, testenum3, int, two, 2) - ctf_enum(ust_tests_td, testenum3, int, three, 3) - ctf_enum(ust_tests_td, testenum3, int, fifteen, 15) - ctf_enum(ust_tests_td, testenum3, int, twenty_one, 21) - ) -) +TRACEPOINT_EVENT(ust_tests_td, + test_auto, + TP_ARGS(void), + TP_FIELDS(ctf_enum(ust_tests_td, testenum3, int, zero, 0) ctf_enum( + ust_tests_td, testenum3, int, two, 2) + ctf_enum(ust_tests_td, testenum3, int, three, 3) ctf_enum( + ust_tests_td, testenum3, int, fifteen, 15) + ctf_enum(ust_tests_td, testenum3, int, twenty_one, 21))) #endif /* _TRACEPOINT_UST_TESTS_TD_H */