X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fhello%2Fust_tests_hello.h;h=7b6b787083a743b997ab24d16fad0b9d616e5224;hb=d2428e875af8666473fb689429eaf1022862510d;hp=86e4ce7d2d84e6a74d5910f638d0484c07933b0b;hpb=a4ada9b87a62c26061c109abe0fd502e16f03db2;p=lttng-ust.git diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h index 86e4ce7d..7b6b7870 100644 --- a/tests/hello/ust_tests_hello.h +++ b/tests/hello/ust_tests_hello.h @@ -11,29 +11,33 @@ extern "C" { /* * Copyright (C) 2011 Mathieu Desnoyers * - * 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 +#include TRACEPOINT_EVENT(ust_tests_hello, tptest, - TP_PROTO(int anint, int netint, long *values, - char *text, size_t textlen, - double doublearg, float floatarg), - TP_VARS(anint, netint, values, text, textlen, - doublearg, floatarg), + 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) @@ -49,23 +53,24 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest, 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 +#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h -/* This part must be outside protection */ +/* This part must be outside ifdef protection */ #include -#ifdef __cplusplus +#ifdef __cplusplus } #endif