Tests: Add UST snapshot local and streaming
authorJulien Desfossez <jdesfossez@efficios.com>
Thu, 4 Jul 2013 02:29:41 +0000 (22:29 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Thu, 4 Jul 2013 16:21:32 +0000 (12:21 -0400)
Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
tests/regression/tools/snapshots/Makefile.am
tests/regression/tools/snapshots/test_ust [new file with mode: 0755]
tests/regression/tools/snapshots/test_ust_streaming [new file with mode: 0755]
tests/utils/utils.sh

index dd97cf6d3722707cdcc9649278270dbec54f8b54..40cb8e1102b4e6ae14ec1af172c6a2ab642ba78e 100644 (file)
@@ -1,2 +1,2 @@
-noinst_SCRIPTS = test_kernel
-EXTRA_DIST = test_kernel
+noinst_SCRIPTS = test_kernel test_kernel_streaming test_ust test_ust_streaming
+EXTRA_DIST = test_kernel test_kernel_streaming test_ust test_ust_streaming
diff --git a/tests/regression/tools/snapshots/test_ust b/tests/regression/tools/snapshots/test_ust
new file mode 100755 (executable)
index 0000000..1e24411
--- /dev/null
@@ -0,0 +1,121 @@
+#!/bin/bash
+#
+# Copyright (C) - 2013 Julien Desfossez <jdesfossez@efficios.com>
+#
+# 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
+TEST_DESC="Snapshots - UST tracing"
+
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/../../..
+EVENT_NAME="tp:tptest"
+BIN_NAME="gen-nevents"
+PID_RELAYD=0
+SESSION_NAME=""
+CHANNEL_NAME="snapchan"
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
+NR_ITER=2000000
+NR_USEC_WAIT=100
+
+TRACE_PATH=$(mktemp -d)
+
+NUM_TESTS=2019
+
+source $TESTDIR/utils/utils.sh
+
+if [ ! -x "$TESTAPP_BIN" ]; then
+       BAIL_OUT "No UST events binary detected."
+fi
+
+function test_ust_local_snapshot ()
+{
+       diag "Test local UST snapshots"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing $SESSION_NAME
+       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       ok $? "Start application to trace"
+       lttng_snapshot_record $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       # Validate test
+       validate_trace $EVENT_NAME $TRACE_PATH/
+       if [ $? -eq 0 ]; then
+               # Only delete if successful
+               rm -rf $TRACE_PATH
+       else
+               break
+       fi
+       diag "Killing $TESTAPP_NAME"
+       PID_APP=`pidof $TESTAPP_NAME`
+       kill $PID_APP >/dev/null 2>&1
+}
+
+function test_ust_1000_local_snapshots ()
+{
+       NB_SNAP=1000
+
+       diag "Test $NB_SNAP local UST snapshots"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing $SESSION_NAME
+       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       for i in $(seq 1 $NB_SNAP); do
+               diag "Snapshot $i/$NB_SNAP"
+               rm -rf $TRACE_PATH/snapshot/* 2>/dev/null
+               lttng_snapshot_record $SESSION_NAME
+               # Validate test
+               validate_trace $EVENT_NAME $TRACE_PATH/
+               if [ $? -eq 0 ]; then
+                       # Only delete if successful
+                       rm -rf $TRACE_PATH
+               else
+                       break
+               fi
+       done
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+       diag "Killing $TESTAPP_NAME"
+       PID_APP=`pidof $TESTAPP_NAME`
+#      kill $PID_APP >/dev/null 2>&1
+}
+
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
+if [ "$(id -u)" == "0" ]; then
+       isroot=1
+else
+       isroot=0
+fi
+
+start_lttng_sessiond
+
+tests=( test_ust_local_snapshot test_ust_1000_local_snapshots )
+
+for fct_test in ${tests[@]};
+do
+       SESSION_NAME=$(randstring 16 0)
+       ${fct_test}
+
+done
+
+stop_lttng_sessiond
diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
new file mode 100755 (executable)
index 0000000..3aa3858
--- /dev/null
@@ -0,0 +1,185 @@
+#!/bin/bash
+#
+# Copyright (C) - 2013 David Goulet <dgoulet@efficios.com>
+#
+# 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
+TEST_DESC="Streaming - Snapshot UST tracing"
+
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/../../..
+EVENT_NAME="tp:tptest"
+PID_RELAYD=0
+SESSION_NAME=""
+CHANNEL_NAME="chan1"
+BIN_NAME="gen-nevents"
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
+NR_ITER=2000000
+NR_USEC_WAIT=100
+
+TRACE_PATH=$(mktemp -d)
+
+NUM_TESTS=39
+
+source $TESTDIR/utils/utils.sh
+
+if [ ! -x "$TESTAPP_BIN" ]; then
+       BAIL_OUT "No UST events binary detected."
+fi
+
+function snapshot_add_output ()
+{
+       local sess_name=$1
+       local trace_path=$2
+       local name=$3
+       local extra_opt=""
+
+       if [ ! -z $name ]; then
+               extra_opt="-n $name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
+       ok $? "Added snapshot output $trace_path"
+}
+
+# Test a snapshot using a default name for the output destination.
+function test_ust_default_name_with_del()
+{
+       diag "Test UST snapshot streaming with default name with delete output"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing $SESSION_NAME
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       ok $? "Start application to trace"
+       snapshot_add_output $SESSION_NAME "net://localhost"
+       lttng_snapshot_record $SESSION_NAME
+
+       # Validate test
+       echo $TRACE_PATH/$HOSTNAME/snapshot-1
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+
+       lttng_snapshot_del_output $SESSION_NAME 1
+       snapshot_add_output $SESSION_NAME "net://localhost"
+       lttng_snapshot_record $SESSION_NAME
+
+       # Validate test with the next ID since a del output was done prior.
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-2*
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       diag "Killing $TESTAPP_NAME"
+       PID_APP=`pidof $TESTAPP_NAME`
+       kill $PID_APP >/dev/null 2>&1
+
+       return 0
+}
+
+# Test a snapshot using a default name for the output destination.
+function test_ust_default_name()
+{
+       diag "Test UST snapshot streaming with default name"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing $SESSION_NAME
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       ok $? "Start application to trace"
+       snapshot_add_output $SESSION_NAME "net://localhost"
+       lttng_snapshot_record $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+       # Validate test
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+       out=$?
+
+       diag "Killing $TESTAPP_NAME"
+       PID_APP=`pidof $TESTAPP_NAME`
+       kill $PID_APP >/dev/null 2>&1
+
+       return $out
+}
+
+# Test a snapshot using a custom name for the output destination.
+function test_ust_custom_name()
+{
+       local out
+       local name="asnapshotname"
+
+       diag "Test UST snapshot streaming with custom name"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing $SESSION_NAME
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       ok $? "Start application to trace"
+       snapshot_add_output $SESSION_NAME "net://localhost" $name
+       lttng_snapshot_record $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
+               ok 0 "Custom name snapshot exists"
+               # Validate test
+               validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$name-*
+               out=$?
+       else
+               fail "No custom name snapshot found"
+               out=1
+       fi
+
+       diag "Killing $TESTAPP_NAME"
+       PID_APP=`pidof $TESTAPP_NAME`
+       kill $PID_APP >/dev/null 2>&1
+
+       return $out
+}
+
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
+if [ "$(id -u)" == "0" ]; then
+       isroot=1
+else
+       isroot=0
+fi
+
+start_lttng_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
+
+tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name )
+
+for fct_test in ${tests[@]};
+do
+       SESSION_NAME=$(randstring 16 0)
+       ${fct_test}
+       if [ $? -eq 0 ]; then
+               # Only delete if successful
+               rm -rf $TRACE_PATH
+       else
+               break
+       fi
+done
+
+stop_lttng_sessiond
+stop_lttng_relayd
index 5fca4a0227ceaec51cd9c46c2ae746520a851af2..a09089afd4c7313a80415dfc9d707fdc75795d4f 100644 (file)
@@ -233,12 +233,29 @@ function enable_lttng_mmap_overwrite_kernel_channel()
        ok $? "Enable channel $channel_name for session $sess_name"
 }
 
+function enable_lttng_mmap_overwrite_ust_channel()
+{
+       sess_name=$1
+       channel_name=$2
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >/dev/null 2>&1
+       ok $? "Enable channel $channel_name for session $sess_name"
+}
+
 function enable_ust_lttng_event ()
 {
        sess_name=$1
        event_name="$2"
+       channel_name=$3
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >/dev/null 2>&1
        ok $? "Enable event $event_name for session $sess_name"
 }
 
@@ -367,7 +384,7 @@ function validate_trace
        for i in $event_name; do
                traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $i | wc -l)
                if [ "$traced" -ne 0 ]; then
-                       pass "Validate trace for event $i"
+                       pass "Validate trace for event $i, $traced events"
                else
                        fail "Validate trace for event $i"
                        diag "Found $traced occurences of $i"
This page took 0.031003 seconds and 5 git commands to generate.