From b6a8c35ef258f287d41cfd3f34f0ca3f12dbbf0a Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Mon, 13 May 2013 18:30:54 -0400 Subject: [PATCH] Tests: Replace usage of gen-ust-events testapp in ust buffers-uid test Use the gen-ust-events binary found under tests/utils/testapp/gen-ust-events/. Signed-off-by: Christian Babeux Signed-off-by: David Goulet --- tests/regression/ust/buffers-uid/Makefile.am | 14 ----- .../regression/ust/buffers-uid/gen-nevents.c | 56 ------------------- .../ust/buffers-uid/test_buffers_uid | 24 ++++---- tests/regression/ust/buffers-uid/tp.c | 16 ------ .../ust/buffers-uid/ust_gen_nevents.h | 56 ------------------- 5 files changed, 14 insertions(+), 152 deletions(-) delete mode 100644 tests/regression/ust/buffers-uid/gen-nevents.c delete mode 100644 tests/regression/ust/buffers-uid/tp.c delete mode 100644 tests/regression/ust/buffers-uid/ust_gen_nevents.h diff --git a/tests/regression/ust/buffers-uid/Makefile.am b/tests/regression/ust/buffers-uid/Makefile.am index 31fb019a4..4fefd8052 100644 --- a/tests/regression/ust/buffers-uid/Makefile.am +++ b/tests/regression/ust/buffers-uid/Makefile.am @@ -1,16 +1,2 @@ -AM_CFLAGS = -I$(srcdir) -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 = test_buffers_uid EXTRA_DIST = test_buffers_uid diff --git a/tests/regression/ust/buffers-uid/gen-nevents.c b/tests/regression/ust/buffers-uid/gen-nevents.c deleted file mode 100644 index b2c19927f..000000000 --- a/tests/regression/ust/buffers-uid/gen-nevents.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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/regression/ust/buffers-uid/test_buffers_uid b/tests/regression/ust/buffers-uid/test_buffers_uid index 3b5c7a67a..6af675cfd 100755 --- a/tests/regression/ust/buffers-uid/test_buffers_uid +++ b/tests/regression/ust/buffers-uid/test_buffers_uid @@ -19,15 +19,19 @@ TEST_DESC="UST tracer - Tracing with per UID buffers" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. NR_ITER=100 +NR_USEC_WAIT=100000 SESSION_NAME="buffers-uid" -EVENT_NAME="ust_gen_nevents:tptest" -BIN_NAME="gen-nevents" + +TESTAPP_PATH="$TESTDIR/utils/testapp" +TESTAPP_NAME="gen-ust-events" +TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" +EVENT_NAME="tp:tptest" NUM_TESTS=58 source $TESTDIR/utils/utils.sh -if [ ! -x "$CURDIR/gen-nevents" ]; then - BAIL_OUT "No UST nevents binary detected." +if [ ! -x "$TESTAPP_BIN" ]; then + BAIL_OUT "No UST events binary detected." fi # MUST set TESTDIR before calling those functions @@ -44,7 +48,7 @@ function enable_channel_per_uid() function wait_apps { diag "Waiting for applications to end..." - while [ -n "$(pidof $BIN_NAME)" ]; do + while [ -n "$(pidof $TESTAPP_NAME)" ]; do sleep 1 done } @@ -62,7 +66,7 @@ test_after_multiple_apps() { start_lttng_tracing $SESSION_NAME for i in `seq 1 5`; do - ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1 + $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1 ok $? "Start application $i for tracing" done wait_apps @@ -82,7 +86,7 @@ test_before_multiple_apps() { diag "Start multiple applications BEFORE tracing is started" for i in `seq 1 5`; do - ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1 + $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1 ok $? "Start application $i for tracing" done @@ -125,7 +129,7 @@ test_after_app() { enable_ust_lttng_event $SESSION_NAME $EVENT_NAME start_lttng_tracing $SESSION_NAME - ./$CURDIR/$BIN_NAME $NR_ITER + $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ok $? "Start application to trace" stop_lttng_tracing $SESSION_NAME @@ -141,7 +145,7 @@ test_before_app() { diag "Start application BEFORE tracing is started" - ./$CURDIR/$BIN_NAME $NR_ITER & + $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & ok $? "Start application to trace" # BEFORE application is spawned @@ -197,7 +201,7 @@ test_multiple_channels() { ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4" start_lttng_tracing $SESSION_NAME - ./$CURDIR/$BIN_NAME $NR_ITER + $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ok $? "Start application to trace" stop_lttng_tracing $SESSION_NAME diff --git a/tests/regression/ust/buffers-uid/tp.c b/tests/regression/ust/buffers-uid/tp.c deleted file mode 100644 index e291924a3..000000000 --- a/tests/regression/ust/buffers-uid/tp.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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/regression/ust/buffers-uid/ust_gen_nevents.h b/tests/regression/ust/buffers-uid/ust_gen_nevents.h deleted file mode 100644 index bc09c4497..000000000 --- a/tests/regression/ust/buffers-uid/ust_gen_nevents.h +++ /dev/null @@ -1,56 +0,0 @@ -#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 -- 2.34.1