X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_notifier_discarded_count;h=b0fce8aa8d59f722a469d6d08cb6fd6c7ffdd374;hb=761ffce23895ccf66a7a410b9037fa3f128fb20a;hp=e49d355285c59e15d77c5112b28202b35732ea3f;hpb=38eb8a68a2817b040e31c577a9e3a81b52897816;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/test_notification_notifier_discarded_count b/tests/regression/tools/notification/test_notification_notifier_discarded_count
index e49d35528..b0fce8aa8 100755
--- a/tests/regression/tools/notification/test_notification_notifier_discarded_count
+++ b/tests/regression/tools/notification/test_notification_notifier_discarded_count
@@ -27,8 +27,8 @@ source "$CURDIR/util_event_generator.sh"
 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
 FULL_LTTNG_SESSIOND_BIN="${TESTDIR}/../src/bin/lttng-sessiond/lttng-sessiond"
 
-UST_NUM_TESTS=16
-KERNEL_NUM_TESTS=15
+UST_NUM_TESTS=18
+KERNEL_NUM_TESTS=17
 NUM_TESTS=$(($UST_NUM_TESTS + $KERNEL_NUM_TESTS))
 
 plan_tests $NUM_TESTS
@@ -60,11 +60,15 @@ function test_kernel_notifier_discarded_count
 
 	"$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
 
-	# Confirm that the discarded notification line is present.
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded: 0"
-	ok $? "No discarded tracer notification"
+	# Confirm that the discarded notification line is not present.
+	cat "$list_triggers_stdout" | grep -v --quiet "discarded tracer messages"
+	ok $? "No discarded tracer notification message"
+
+	tail -n 1 "$list_triggers_stdout" | grep --quiet "errors: none"
+	ok $? "Trigger 'errors: none' notification message"
 
 	# Stop consumption of notifier tracer notifications.
+	diag "Pause consumption of tracer messages"
 	echo -n 1 > $sessiond_pipe
 
 	# The notifier ring buffer configuration is currently made of 16 4096
@@ -72,17 +76,17 @@ function test_kernel_notifier_discarded_count
 	# To fill it, we need to generate (16 * 4096)/42 = 1561 notifications.
 	# That number is a bit larger than what we need since some of the space
 	# is lost in subbuffer boundaries.
-	echo -n "200000" > /proc/lttng-test-filter-event
+	echo -n "2000" > /proc/lttng-test-filter-event
 
 	"$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
 
 	# Confirm that the discarded notification line is present. To avoid
 	# false positives.
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded"
+	cat "$list_triggers_stdout" | grep --quiet "discarded tracer messages"
 	ok $? "Tracer notification discarded line printed"
 
-	# Confirm that the number of tracer notifications discarded is not zero.
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded: 0"
+	# Confirm that the number of dicarded tracer messages is not zero.
+	cat "$list_triggers_stdout" | grep --quiet "discarded tracer messages: 0"
 	isnt $? 0 "Discarded tracer notification number non-zero as expected"
 
 	lttng_remove_trigger_ok "$trigger_name"
@@ -96,10 +100,14 @@ function test_kernel_notifier_discarded_count
 		--condition on-event --kernel lttng_test_filter_event \
 		--action notify
 
-	# Confirm that the discarded notification line is present.
 	"$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded: 0"
-	ok $? "No discarded tracer notification"
+
+	# Confirm that the discarded notification line is not present.
+	cat "$list_triggers_stdout" | grep -v --quiet "discarded tracer messages"
+	ok $? "No discarded tracer notification message"
+
+	tail -n 1 "$list_triggers_stdout" | grep --quiet "errors: none"
+	ok $? "Trigger 'errors: none' notification message"
 
 	lttng_remove_trigger_ok "$trigger_name"
 
@@ -112,7 +120,7 @@ function test_kernel_notifier_discarded_count
 
 function test_kernel_notifier_discarded_count_max_bucket
 {
-	start_lttng_sessiond "" "--event-notifier-error-number-of-bucket=3"
+	start_lttng_sessiond "" "--event-notifier-error-buffer-size-kernel=3"
 
 	diag "Kernel event notifer error counter bucket limit"
 	for i in $(seq 3); do
@@ -174,11 +182,15 @@ function test_ust_notifier_discarded_count
 
 	"$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
 
-	# Confirm that the discarded notification line is present.
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded: 0"
-	ok $? "No discarded tracer notification"
+	# Confirm that the discarded notification line is not present.
+	cat "$list_triggers_stdout" | grep -v --quiet "discarded tracer messages"
+	ok $? "No discarded tracer notification message"
+
+	tail -n 1 "$list_triggers_stdout" | grep --quiet "errors: none"
+	ok $? "Trigger 'errors: none' notification message"
 
 	# Stop consumption of notifier tracer notifications.
+	diag "Pause consumption of tracer messages"
 	echo -n 1 > $sessiond_pipe
 
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
@@ -188,11 +200,11 @@ function test_ust_notifier_discarded_count
 
 	# Confirm that the discarded notification line is present. To avoid
 	# false positive.
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded"
+	cat "$list_triggers_stdout" | grep --quiet "discarded tracer messages"
 	ok $? "Tracer notification discarded line printed"
 
-	# Confirm that the number of tracer notifications discarded is not zero.
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded: 0"
+	# Confirm that the number of discarded tracer messages is not zero.
+	cat "$list_triggers_stdout" | grep --quiet "discarded tracer messages: 0"
 	isnt $? 0 "Discarded tracer notification number non-zero as expected"
 
 	# Remove the notifier.
@@ -207,10 +219,15 @@ function test_ust_notifier_discarded_count
 		--condition on-event --userspace tp:tptest \
 		--action notify
 
-	# Confirm that the discarded notification line is present.
+	# Confirm that the discarded notification line is not present.
 	"$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
-	cat "$list_triggers_stdout" | grep --quiet "tracer notifications discarded: 0"
-	ok $? "No discarded tracer notification"
+
+	# Confirm that the discarded notification line is not present.
+	cat "$list_triggers_stdout" | grep -v --quiet "discarded tracer messages"
+	ok $? "No discarded tracer notification message"
+
+	tail -n 1 "$list_triggers_stdout" | grep --quiet "errors: none"
+	ok $? "Trigger 'errors: none' notification message"
 
 	lttng_remove_trigger_ok "$trigger_name"
 
@@ -222,7 +239,7 @@ function test_ust_notifier_discarded_count
 }
 function test_ust_notifier_discarded_count_max_bucket
 {
-	start_lttng_sessiond "" "--event-notifier-error-number-of-bucket=3"
+	start_lttng_sessiond "" "--event-notifier-error-buffer-size-userspace=3"
 
 	diag "UST event notifer error counter bucket limit"
 	for i in $(seq 3); do