X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_multi_app;h=5d5427c9d03759eee3797cc326f8131c0457edec;hp=7465a83f813fa7bdc8d34cb6bfaab745d44d897a;hb=091fa780af74dc1a93eaeff50d8c0baf1de8c41f;hpb=7fe98a985f6fddf7eba195c138fad23339676979

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index 7465a83f8..5d5427c9d 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) - 2017 Jonathan Rajotte <jonathan.rajotte-julien@efficiso.com>>
+# Copyright (C) 2017 Jonathan Rajotte <jonathan.rajotte-julien@efficiso.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
+# SPDX-License-Identifier: LGPL-2.1-only
 
 TEST_DESC="Notification"
 
@@ -43,6 +32,7 @@ NUM_TEST_KERNEL=50
 NUM_TESTS=$(($NUM_TEST_UST + $NUM_TEST_KERNEL))
 
 source $TESTDIR/utils/utils.sh
+source $CURDIR/util_event_generator.sh
 
 consumerd_pipe=()
 file_sync_after_first_event=$(mktemp -u)
@@ -54,54 +44,6 @@ print_test_banner "$TEST_DESC"
 
 app_pids=()
 
-function kernel_event_generator_toogle_state
-{
-	kernel_event_generator_suspended=$((kernel_event_generator_suspended==0))
-
-}
-function kernel_event_generator
-{
-	state_file=$1
-	kernel_event_generator_suspended=0
-	trap kernel_event_generator_toogle_state SIGUSR1
-	trap "exit" SIGTERM SIGINT
-	while (true); do
-		if [[ $kernel_event_generator_suspended -eq "1" ]]; then
-			touch $state_file
-			sleep 0.5
-		else
-			if [[ -f $state_file ]]; then
-				rm $state_file 2> /dev/null
-			fi
-			echo -n "1000" > /proc/lttng-test-filter-event
-		fi
-	done
-}
-
-function ust_event_generator_toogle_state
-{
-	ust_event_generator_suspended=$((ust_event_generator_suspended==0))
-
-}
-function ust_event_generator
-{
-	state_file=$1
-	ust_event_generator_suspended=0
-	trap ust_event_generator_toogle_state SIGUSR1
-	trap "exit" SIGTERM SIGINT
-	while (true); do
-		if [[ $ust_event_generator_suspended -eq "1" ]]; then
-			touch $state_file
-			sleep 0.5
-		else
-			if [[ -f $state_file ]]; then
-				rm $state_file 2> /dev/null
-			fi
-			taskset  -c 0 $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT > /dev/null 2>&1
-		fi
-	done
-}
-
 function start_client {
 	local pid=-1
 	local output_file=$1
@@ -112,8 +54,9 @@ function start_client {
 	local buffer_usage_threshold_type=$6
 	local buffer_usage_threshold_value=$7
 	local nr_expected_notification=$8
+	local use_action_group=$9
 
-	${CURDIR}/base_client ${session_name} ${channel_name} ${domain_type} ${buffer_usage_type} ${buffer_usage_threshold_type} ${buffer_usage_threshold_value} ${nr_expected_notification} > ${output_file} &
+	${CURDIR}/base_client ${session_name} ${channel_name} ${domain_type} ${buffer_usage_type} ${buffer_usage_threshold_type} ${buffer_usage_threshold_value} ${nr_expected_notification} ${use_action_group} > ${output_file} &
 	pid=$!
 
 	app_pids+=("$pid")
@@ -235,8 +178,8 @@ function test_multi_app ()
 	for (( i = 0; i < $nr_client_app; i++ )); do
 		low_app_output_file=$output_dir/${low_output_file_pattern}${i}
 		high_app_output_file=$output_dir/${high_output_file_pattern}${i}
-		start_client $low_app_output_file $SESSION_NAME $CHANNEL_NAME $domain_string LOW RATIO 0.0 $nr_notification_expected
-		start_client $high_app_output_file $SESSION_NAME $CHANNEL_NAME $domain_string HIGH RATIO 0.420 $nr_notification_expected
+		start_client $low_app_output_file $SESSION_NAME $CHANNEL_NAME $domain_string LOW RATIO 0.0 $nr_notification_expected $(( $i % 2))
+		start_client $high_app_output_file $SESSION_NAME $CHANNEL_NAME $domain_string HIGH RATIO 0.420 $nr_notification_expected $(( $i % 2))
 	done
 
 	wait_for_message $output_dir "${low_output_file_pattern}" "sync: ready"
@@ -297,7 +240,6 @@ function test_multi_app ()
 		print_errors $output_dir "${high_output_file_pattern}"
 	fi
 
-	rm -rf $output_dir
 
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
@@ -305,17 +247,19 @@ function test_multi_app ()
 	for pipe in "${consumerd_pipe[@]}"; do
 		rm -rf "${pipe}"
 	done
+
+	rm -rf $output_dir
 }
 
 function test_multi_app_ust ()
 {
 	diag "Multi client app UST notification"
-	ust_event_generator $TESTAPP_STATE_FILE &
+	ust_event_generator "$TESTAPP_BIN" "$TESTAPP_STATE_FILE" &
 	local generator_pid=$!
 
 	test_multi_app ust $generator_pid
 
-	kill -s SIGTERM $generator_pid 2> /dev/null
+	kill -s SIGUSR2 $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 }
@@ -325,17 +269,17 @@ function test_multi_app_kernel ()
 	diag "Multi client app kernel notification"
 	modprobe lttng-test
 
-	kernel_event_generator $TESTAPP_STATE_FILE &
+	kernel_event_generator generate_filter_events $TESTAPP_STATE_FILE &
 	local generator_pid=$!
 
 	test_multi_app kernel $generator_pid
 
 
-	kill -s SIGTERM $generator_pid 2> /dev/null
+	kill -s SIGUSR2 $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 }
 
 function test_on_register_evaluation_ust ()
@@ -343,12 +287,12 @@ function test_on_register_evaluation_ust ()
 	diag "On register notification UST"
 
 	# Start app in infinite loop
-	ust_event_generator $TESTAPP_STATE_FILE &
+	ust_event_generator "$TESTAPP_BIN" "$TESTAPP_STATE_FILE" &
 	local generator_pid=$!
 
 	test_on_register_evaluation ust $generator_pid
 
-	kill -s SIGTERM $generator_pid 2> /dev/null
+	kill -s SIGUSR2 $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
@@ -360,17 +304,17 @@ function test_on_register_evaluation_kernel()
 
 	modprobe lttng-test
 
-	kernel_event_generator $TESTAPP_STATE_FILE &
+	kernel_event_generator generate_filter_events $TESTAPP_STATE_FILE &
 	local generator_pid=$!
 
 	test_on_register_evaluation kernel $generator_pid
 
 
-	kill -s SIGTERM $generator_pid 2> /dev/null
+	kill -s SIGUSR2 $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 }
 
 function test_on_register_evaluation ()
@@ -419,7 +363,7 @@ function test_on_register_evaluation ()
 
 	high_app_output_file=${high_output_file_pattern}.first_receiver
 	high_app_output_path=$output_dir/${high_app_output_file}
-	start_client $high_app_output_path $SESSION_NAME $CHANNEL_NAME $domain_string HIGH RATIO 0.420 1
+	start_client $high_app_output_path $SESSION_NAME $CHANNEL_NAME $domain_string HIGH RATIO 0.420 1 0
 
 	wait_for_message $output_dir "${high_app_output_file}" "sync: ready"
 
@@ -436,7 +380,7 @@ function test_on_register_evaluation ()
 	# notification on subscription
 	high_app_output_file=${high_output_file_pattern}.second_receiver
 	high_app_output_path=$output_dir/${high_app_output_file}
-	start_client $high_app_output_path $SESSION_NAME $CHANNEL_NAME $domain_string HIGH RATIO 0.420 1
+	start_client $high_app_output_path $SESSION_NAME $CHANNEL_NAME $domain_string HIGH RATIO 0.420 1 0
 	wait_for_message $output_dir "${high_app_output_file}" "sync: ready"
 	wait_for_message $output_dir "${high_app_output_file}" "notification: high 0"
 
@@ -453,18 +397,18 @@ function test_on_register_evaluation ()
 		print_errors "${high_output_file_pattern}"
 	fi
 
-	rm -rf $output_dir
 
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
 
-	kill -s SIGTERM $generator_pid 2> /dev/null
+	kill -s SIGUSR2 $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 
 	for pipe in "${consumerd_pipe[@]}"; do
 		rm -rf "${pipe}"
 	done
 
+	rm -rf "$output_dir"
 }
 
 
@@ -474,6 +418,7 @@ TESTS=(
 )
 
 if [ "$(id -u)" == "0" ]; then
+	validate_lttng_modules_present
 	TESTS+=(
 	test_multi_app_kernel
 	test_on_register_evaluation_kernel