X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fhello%2Fust_tests_hello.h;h=84a799a05d32946e8b0e92b33158a55539041c9d;hb=48d660d146a6c8c7c8a54a183faac7d493deb32b;hp=8a4063f60b929ffbc0a3e0f613f4b95afd36a9d2;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h index 8a4063f6..84a799a0 100644 --- a/tests/hello/ust_tests_hello.h +++ b/tests/hello/ust_tests_hello.h @@ -4,10 +4,6 @@ #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 * @@ -20,14 +16,24 @@ extern "C" { * * 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. */ #include +#include TRACEPOINT_EVENT(ust_tests_hello, tptest, TP_ARGS(int, anint, int, netint, long *, values, - char *, text, size_t, textlen, - double, doublearg, float, floatarg), + char *, text, size_t, textlen, + double, doublearg, float, floatarg, + bool, boolarg), TP_FIELDS( ctf_integer(int, intfield, anint) ctf_integer_hex(int, intfield2, anint) @@ -40,9 +46,13 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest, 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) ) ) @@ -53,12 +63,8 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler, #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */ -#undef TRACEPOINT_INCLUDE_FILE -#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h +#undef TRACEPOINT_INCLUDE +#define TRACEPOINT_INCLUDE "./ust_tests_hello.h" /* This part must be outside ifdef protection */ #include - -#ifdef __cplusplus -} -#endif