From b19155c048f4cb6be12d402f1708e2e4ff80fa98 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 2 Apr 2012 14:44:55 -0400 Subject: [PATCH] Add before-after test Test tracing before and after application execution. Signed-off-by: David Goulet --- configure.ac | 1 + tests/test_list.py | 6 ++ tests/ust/Makefile.am | 2 +- tests/ust/before-after/Makefile.am | 16 +++ tests/ust/before-after/gen-nevents.c | 56 +++++++++++ tests/ust/before-after/run | 120 +++++++++++++++++++++++ tests/ust/before-after/tp.c | 16 +++ tests/ust/before-after/ust_gen_nevents.h | 56 +++++++++++ tests/ust/runall.sh | 2 +- 9 files changed, 273 insertions(+), 2 deletions(-) create mode 100644 tests/ust/before-after/Makefile.am create mode 100644 tests/ust/before-after/gen-nevents.c create mode 100755 tests/ust/before-after/run create mode 100644 tests/ust/before-after/tp.c create mode 100644 tests/ust/before-after/ust_gen_nevents.h diff --git a/configure.ac b/configure.ac index d28dab876..4e058510c 100644 --- a/configure.ac +++ b/configure.ac @@ -201,6 +201,7 @@ AC_CONFIG_FILES([ tests/ust/nprocesses/Makefile tests/ust/high-throughput/Makefile tests/ust/low-throughput/Makefile + tests/ust/before-after/Makefile ]) AC_OUTPUT diff --git a/tests/test_list.py b/tests/test_list.py index 375e07320..238164a3f 100644 --- a/tests/test_list.py +++ b/tests/test_list.py @@ -59,4 +59,10 @@ Tests = \ 'success': 0, 'enabled': False # Deactivated. This test last 20 minutes... }, + { + 'bin': "ust/before-after/run", 'daemon': True, 'kern': False, + 'name': "UST tracer - Tracing before and after app execution", + 'desc': "Test tracing before and after app execution", + 'success': 0, 'enabled': True + }, ] diff --git a/tests/ust/Makefile.am b/tests/ust/Makefile.am index 79f67cc06..1c8295ccc 100644 --- a/tests/ust/Makefile.am +++ b/tests/ust/Makefile.am @@ -1,5 +1,5 @@ if HAVE_LIBLTTNG_UST_CTL -SUBDIRS = nevents nprocesses high-throughput +SUBDIRS = nevents nprocesses high-throughput low-throughput before-after AM_CFLAGS = -g -Wall -I../ AM_LDFLAGS = -lurcu -lurcu-cds diff --git a/tests/ust/before-after/Makefile.am b/tests/ust/before-after/Makefile.am new file mode 100644 index 000000000..29652dcbb --- /dev/null +++ b/tests/ust/before-after/Makefile.am @@ -0,0 +1,16 @@ +AM_CFLAGS = -I. -O2 +AM_LDFLAGS = -llttng-ust + +if LTTNG_TOOLS_BUILD_WITH_LIBDL +AM_LDFLAGS += -ldl +endif +if LTTNG_TOOLS_BUILD_WITH_LIBC_DL +AM_LDFLAGS += -lc +endif + +noinst_PROGRAMS = gen-nevents +gen_nevents_SOURCES = gen-nevents.c tp.c ust_gen_nevents.h +gen_nevents_LDADD = -llttng-ust + +noinst_SCRIPTS = run +EXTRA_DIST = run diff --git a/tests/ust/before-after/gen-nevents.c b/tests/ust/before-after/gen-nevents.c new file mode 100644 index 000000000..b2c19927f --- /dev/null +++ b/tests/ust/before-after/gen-nevents.c @@ -0,0 +1,56 @@ +/* + * Copyright (C) - 2009 Pierre-Marc Fournier + * Copyright (C) - 2011 Mathieu Desnoyers + * Copyright (C) - 2012 David Goulet + * + * 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 +#include + +#define TRACEPOINT_DEFINE +#include "ust_gen_nevents.h" + +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; + unsigned int nr_iter = 100; + + if (argc == 2) { + nr_iter = atoi(argv[1]); + } + + for (i = 0; i < nr_iter; i++) { + netint = htonl(i); + tracepoint(ust_gen_nevents, tptest, i, netint, values, text, + strlen(text), dbl, flt); + usleep(100000); + } + + return 0; +} diff --git a/tests/ust/before-after/run b/tests/ust/before-after/run new file mode 100755 index 000000000..9b1652821 --- /dev/null +++ b/tests/ust/before-after/run @@ -0,0 +1,120 @@ +#!/bin/bash +# +# Copyright (C) - 2012 David Goulet +# +# 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 + +CURDIR=$(dirname $0)/ +TESTDIR=$CURDIR/../.. +NR_ITER=100 +SESSION_NAME="per-session" +EVENT_NAME="ust_gen_nevents:tptest" + +source $TESTDIR/utils.sh + +echo -e "\n----------------------------------------------------" +echo -e "UST tracer - Star tracing before and after execution" +echo -e "----------------------------------------------------" + +if [ ! -x "$CURDIR/gen-nevents" ]; then + echo -e "No UST nevents binary detected. Passing." + exit 0 +fi + +# MUST set TESTDIR before calling those functions + +test_before_apps() { + local out + + # BEFORE application is spawned + create_lttng_session $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event $SESSION_NAME $EVENT_NAME + start_tracing $SESSION_NAME + # Start test + echo -n "Starting application... " + ./$CURDIR/gen-nevents $NR_ITER + echo -e "Ended \e[1;32mOK\e[0m" + stop_tracing $SESSION_NAME + destroy_lttng_session $SESSION_NAME + + trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH + + return $? +} + +test_after_apps() { + local out + + echo -n "Starting application... " + ./$CURDIR/gen-nevents 100 & + echo -e "\e[1;32mOK\e[0m" + + # BEFORE application is spawned + create_lttng_session $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event $SESSION_NAME $EVENT_NAME + start_tracing $SESSION_NAME + + # At least hit one event + sleep 2 + + stop_tracing $SESSION_NAME + destroy_lttng_session $SESSION_NAME + + out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l) + if [ $out -eq 0 ]; then + echo -n "No event found. Suppose to have at least one... " + echo -e "\e[1;31mFAILED\e[0m" + out=1 + else + echo -n "Found $out event(s). Coherent... " + echo -e "\e[1;32mOK\e[0m" + out=0 + fi + + return $out +} + +# MUST set TESTDIR before calling those functions + +start_sessiond + +echo "" +echo "=== Start application BEFORE tracing was started ===" + +TRACE_PATH=$(mktemp -d) + +test_before_apps +out=$? +if [ $out -ne 0 ]; then + stop_sessiond + exit $out +fi + +rm -rf $TRACE_PATH + +echo "" +echo "=== Start application AFTER tracing was started ===" + +TRACE_PATH=$(mktemp -d) + +test_after_apps +out=$? +if [ $out -ne 0 ]; then + stop_sessiond + exit $out +fi + +stop_sessiond + +rm -rf $TRACE_PATH diff --git a/tests/ust/before-after/tp.c b/tests/ust/before-after/tp.c new file mode 100644 index 000000000..e291924a3 --- /dev/null +++ b/tests/ust/before-after/tp.c @@ -0,0 +1,16 @@ +/* + * Copyright (c) - 2011 Mathieu Desnoyers + * Copyright (c) - 2012 David Goulet + * + * 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_gen_nevents.h" diff --git a/tests/ust/before-after/ust_gen_nevents.h b/tests/ust/before-after/ust_gen_nevents.h new file mode 100644 index 000000000..8d82ecb4e --- /dev/null +++ b/tests/ust/before-after/ust_gen_nevents.h @@ -0,0 +1,56 @@ +#undef TRACEPOINT_PROVIDER +#define TRACEPOINT_PROVIDER ust_gen_nevents + +#if !defined(_TRACEPOINT_UST_GEN_NEVENTS_H) || defined(TRACEPOINT_HEADER_MULTI_READ) +#define _TRACEPOINT_UST_GEN_NEVENTS_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_gen_nevents, 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) + ) +) + +#endif /* _TRACEPOINT_UST_GEN_NEVENTS_H */ + +#undef TRACEPOINT_INCLUDE_FILE +#define TRACEPOINT_INCLUDE_FILE ./ust_gen_nevents.h + +/* This part must be outside ifdef protection */ +#include + +#ifdef __cplusplus +} +#endif diff --git a/tests/ust/runall.sh b/tests/ust/runall.sh index f47246fce..4aee65a99 100755 --- a/tests/ust/runall.sh +++ b/tests/ust/runall.sh @@ -3,7 +3,7 @@ DIR=$(dirname $0) tests=( $DIR/run-ust-global-tests.sh $DIR/nevents/run $DIR/nprocesses/run \ - $DIR/high-throughput/run ) + $DIR/high-throughput/run $DIR/before-after/run ) # $DIR/low-throughput/run --> DEACTIVATED. # Use only for release. This test last 20 minutes -- 2.34.1