From 6b79f035b5ffe3afb23ee9079d30f9fbaf7de514 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 29 Nov 2011 07:47:48 -0500 Subject: [PATCH 1/1] Introduce c++ test Signed-off-by: Mathieu Desnoyers --- configure.ac | 2 + tests/Makefile.am | 2 +- tests/hello.cxx/Makefile.am | 8 +++ tests/hello.cxx/README | 1 + tests/hello.cxx/hello.cpp | 94 +++++++++++++++++++++++++++++++ tests/hello.cxx/run | 3 + tests/hello.cxx/tp.c | 17 ++++++ tests/hello.cxx/ust_tests_demo.h | 79 ++++++++++++++++++++++++++ tests/hello.cxx/ust_tests_hello.h | 63 +++++++++++++++++++++ 9 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tests/hello.cxx/Makefile.am create mode 100644 tests/hello.cxx/README create mode 100644 tests/hello.cxx/hello.cpp create mode 100755 tests/hello.cxx/run create mode 100644 tests/hello.cxx/tp.c create mode 100644 tests/hello.cxx/ust_tests_demo.h create mode 100644 tests/hello.cxx/ust_tests_hello.h diff --git a/configure.ac b/configure.ac index d3cac78f..59d08405 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,7 @@ AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel ve # Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_PROG_MAKE_SET AC_PROG_LIBTOOL @@ -231,6 +232,7 @@ AC_CONFIG_FILES([ liblttng-ust-java/Makefile tests/Makefile tests/hello/Makefile + tests/hello.cxx/Makefile tests/demo/Makefile tests/fork/Makefile tests/ust-basic-tracing/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 7ebd64be..dd1317be 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo +SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo hello.cxx #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast dist_noinst_SCRIPTS = test_loop runtests trace_matches diff --git a/tests/hello.cxx/Makefile.am b/tests/hello.cxx/Makefile.am new file mode 100644 index 00000000..81c2a501 --- /dev/null +++ b/tests/hello.cxx/Makefile.am @@ -0,0 +1,8 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include + +noinst_PROGRAMS = hello +hello_SOURCES = hello.cpp tp.c ust_tests_hello.h +hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la + +noinst_SCRIPTS = run +EXTRA_DIST = run diff --git a/tests/hello.cxx/README b/tests/hello.cxx/README new file mode 100644 index 00000000..68b11e69 --- /dev/null +++ b/tests/hello.cxx/README @@ -0,0 +1 @@ +This is a hello world application used to test the LTTng userspace tracer. diff --git a/tests/hello.cxx/hello.cpp b/tests/hello.cxx/hello.cpp new file mode 100644 index 00000000..da33407b --- /dev/null +++ b/tests/hello.cxx/hello.cpp @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2009 Pierre-Marc Fournier + * 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. + * + * 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. + * + * 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 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TRACEPOINT_DEFINE +#include "ust_tests_hello.h" + +void inthandler(int sig) +{ + printf("in SIGUSR1 handler\n"); + tracepoint(ust_tests_hello, tptest_sighandler); +} + +int init_int_handler(void) +{ + int result; + struct sigaction act; + + memset(&act, 0, sizeof(act)); + result = sigemptyset(&act.sa_mask); + if (result == -1) { + perror("sigemptyset"); + return -1; + } + + act.sa_handler = inthandler; + act.sa_flags = SA_RESTART; + + /* Only defer ourselves. Also, try to restart interrupted + * syscalls to disturb the traced program as little as possible. + */ + result = sigaction(SIGUSR1, &act, NULL); + if (result == -1) { + perror("sigaction"); + return -1; + } + + return 0; +} + +int main(int argc, char **argv) +{ + int i, netint; + long values[] = { 1, 2, 3 }; + char text[10] = "test"; + double dbl = 2.0; + float flt = 2222.0; + int delay = 0; + + init_int_handler(); + + if (argc == 2) + delay = atoi(argv[1]); + + fprintf(stderr, "Hello, World!\n"); + + sleep(delay); + + fprintf(stderr, "Tracing... "); + for (i = 0; i < 1000000; i++) { + netint = htonl(i); + tracepoint(ust_tests_hello, tptest, i, netint, values, + text, strlen(text), dbl, flt); + //usleep(100000); + } + fprintf(stderr, " done.\n"); + return 0; +} diff --git a/tests/hello.cxx/run b/tests/hello.cxx/run new file mode 100755 index 00000000..da8df17b --- /dev/null +++ b/tests/hello.cxx/run @@ -0,0 +1,3 @@ +#!/bin/sh + +UST_AUTOPROBE=1 UST_TRACE=1 LD_LIBRARY_PATH=../libust/.libs:../../liburcu $1 .libs/hello diff --git a/tests/hello.cxx/tp.c b/tests/hello.cxx/tp.c new file mode 100644 index 00000000..71a01c81 --- /dev/null +++ b/tests/hello.cxx/tp.c @@ -0,0 +1,17 @@ +/* + * tp.c + * + * Copyright (c) 2011 Mathieu Desnoyers + * + * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * + * Permission is hereby granted to use or copy this program + * for any purpose, provided the above notices are retained on all copies. + * Permission to modify the code and to distribute modified code is granted, + * provided the above notices are retained, and a notice that the code was + * modified is included with the above copyright notice. + */ + +#define TRACEPOINT_CREATE_PROBES +#include "ust_tests_hello.h" diff --git a/tests/hello.cxx/ust_tests_demo.h b/tests/hello.cxx/ust_tests_demo.h new file mode 100644 index 00000000..c79ed891 --- /dev/null +++ b/tests/hello.cxx/ust_tests_demo.h @@ -0,0 +1,79 @@ +#undef TRACEPOINT_PROVIDER +#define TRACEPOINT_PROVIDER ust_tests_demo + +#if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ) +#define _TRACEPOINT_UST_TESTS_DEMO_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * 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. + * + * 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. + * + * 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 + */ + +#include + +TRACEPOINT_EVENT(ust_tests_demo, loop, + TP_ARGS(int, anint, int, netint, long *, values, + char *, text, size_t, textlen, + double, doublearg, float, floatarg), + TP_FIELDS( + ctf_integer(int, intfield, anint) + ctf_integer_hex(int, intfield2, anint) + ctf_integer(long, longfield, anint) + ctf_integer_network(int, netintfield, netint) + ctf_integer_network_hex(int, netintfieldhex, netint) + ctf_array(long, arrfield1, values, 3) + ctf_array_text(char, arrfield2, text, 10) + ctf_sequence(char, seqfield1, text, + size_t, textlen) + ctf_sequence_text(char, seqfield2, text, + size_t, textlen) + ctf_string(stringfield, text) + ctf_float(float, floatfield, floatarg) + ctf_float(double, doublefield, doublearg) + ) +) + +TRACEPOINT_EVENT(ust_tests_demo, starting, + TP_ARGS(int, value), + TP_FIELDS( + ctf_integer(int, value, value) + ) +) + +TRACEPOINT_EVENT(ust_tests_demo, done, + TP_ARGS(int, value), + TP_FIELDS( + ctf_integer(int, value, value) + ) +) + +#endif /* _TRACEPOINT_UST_TESTS_DEMO_H */ + +#undef TRACEPOINT_INCLUDE_PATH +#define TRACEPOINT_INCLUDE_PATH . +#undef TRACEPOINT_INCLUDE_FILE +#define TRACEPOINT_INCLUDE_FILE ust_tests_demo + +/* This part must be outside ifdef protection */ +#include + +#ifdef __cplusplus +} +#endif diff --git a/tests/hello.cxx/ust_tests_hello.h b/tests/hello.cxx/ust_tests_hello.h new file mode 100644 index 00000000..a54bc595 --- /dev/null +++ b/tests/hello.cxx/ust_tests_hello.h @@ -0,0 +1,63 @@ +#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 + * + * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * + * Permission is hereby granted to use or copy this program + * for any purpose, provided the above notices are retained on all copies. + * Permission to modify the code and to distribute modified code is granted, + * provided the above notices are retained, and a notice that the code was + * modified is included with the above copyright notice. + */ + +#include + +TRACEPOINT_EVENT(ust_tests_hello, tptest, + TP_ARGS(int, anint, int, netint, long *, values, + char *, text, size_t, textlen, + double, doublearg, float, floatarg), + TP_FIELDS( + ctf_integer(int, intfield, anint) + ctf_integer_hex(int, intfield2, anint) + ctf_integer(long, longfield, anint) + ctf_integer_network(int, netintfield, netint) + ctf_integer_network_hex(int, netintfieldhex, netint) + ctf_array(long, arrfield1, values, 3) + ctf_array_text(char, arrfield2, text, 10) + ctf_sequence(char, seqfield1, text, + size_t, textlen) + ctf_sequence_text(char, seqfield2, text, + size_t, textlen) + ctf_string(stringfield, text) + ctf_float(float, floatfield, floatarg) + ctf_float(double, doublefield, doublearg) + ) +) + +TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler, + TP_ARGS(), + TP_FIELDS() +) + +#endif /* _TRACEPOINT_UST_TESTS_HELLO_H */ + +#undef TRACEPOINT_INCLUDE_FILE +#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h + +/* This part must be outside ifdef protection */ +#include + +#ifdef __cplusplus +} +#endif -- 2.34.1