CURDIR=$(dirname "$0")/
TESTDIR=$CURDIR/../../../
-TMPDIR=$(mktemp -d)
+TEST_TMPDIR=$(mktemp --tmpdir -d tmp.test_notifier_discarded_count.XXXXXX)
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-TESTPOINT_BASE_PATH=$(readlink -f "$TMPDIR/lttng.t_p_n")
-TESTPOINT_PIPE_PATH=$(mktemp -u "${TESTPOINT_BASE_PATH}.XXXXXX")
+TESTPOINT_BASE_PATH=$(readlink -f "$TEST_TMPDIR/lttng.t_p_n")
+TESTPOINT_PIPE_PATH=$(mktemp -u --tmpdir="$TEST_TMPDIR" "lttng.t_p_n.XXXXXX")
TESTPOINT=$(readlink -f "${CURDIR}/.libs/libpause_sessiond.so")
SH_TAP=1
function trigger_get_discarded_notif_number()
{
local trigger_name="$1"
- local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+ local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
"$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
{
local sessiond_pipe=()
local trigger_name="my_trigger"
- local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+ local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
# Used on sessiond launch.
LTTNG_SESSIOND_ENV_VARS="LTTNG_TESTPOINT_ENABLE=1 \
done
lttng_add_trigger_ok "$trigger_name" \
- --condition event-rule-matches --domain=kernel --name=lttng_test_filter_event \
+ --condition event-rule-matches --type=kernel --name=lttng_test_filter_event \
--action notify
trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
# Enable another notifier and list it to confirm the counter was cleared.
lttng_add_trigger_ok "$trigger_name" \
- --condition event-rule-matches --domain=kernel --name=lttng_test_filter_event \
+ --condition event-rule-matches --type=kernel --name=lttng_test_filter_event \
--action notify
trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
diag "Kernel event notifer error counter bucket limit"
for i in $(seq 3); do
lttng_add_trigger_ok "$i" \
- --condition event-rule-matches --domain=kernel --name=my_event_that_doesnt_need_to_really_exist_$i \
+ --condition event-rule-matches --type=kernel --name=my_event_that_doesnt_need_to_really_exist_$i \
--action notify
done
for i in $(seq 4 5); do
lttng_add_trigger_fail "$i" \
- --condition event-rule-matches --domain=kernel --name=my_event_that_doesnt_need_to_really_exist_$i \
+ --condition event-rule-matches --type=kernel --name=my_event_that_doesnt_need_to_really_exist_$i \
--action notify
done
done
lttng_add_trigger_ok "$trigger_name" \
- --condition event-rule-matches --domain=user --name=tp:tptest \
+ --condition event-rule-matches --type=user --name=tp:tptest \
--action notify
trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
# Enable another notifier and list it to confirm the counter was cleared.
lttng_add_trigger_ok "$trigger_name" \
- --condition event-rule-matches --domain=user --name=tp:tptest \
+ --condition event-rule-matches --type=user --name=tp:tptest \
--action notify
trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
diag "UST event notifer error counter bucket limit"
for i in $(seq 3); do
lttng_add_trigger_ok "$i" \
- --condition event-rule-matches --domain=user --name=my_event_that_doesnt_need_to_really_exist_$i \
+ --condition event-rule-matches --type=user --name=my_event_that_doesnt_need_to_really_exist_$i \
--action notify
done
for i in $(seq 4 5); do
lttng_add_trigger_fail "$i" \
- --condition event-rule-matches --domain=user --name=my_event_that_doesnt_need_to_really_exist_$i \
+ --condition event-rule-matches --type=user --name=my_event_that_doesnt_need_to_really_exist_$i \
--action notify
done
local sessiond_pipe=()
local root_trigger_name="root_trigger"
local user_trigger_name="user_trigger"
- local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+ local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
local NR_USEC_WAIT=0
local PIPE_SIZE
local NR_ITER
done
lttng_add_trigger_ok "$root_trigger_name" \
- --condition on-event --userspace tp:tptest \
+ --condition event-rule-matches --type=user --name tp:tptest \
--action notify
- lttng_add_trigger_ok "$user_trigger_name" --user-id "$new_uid" \
- --condition on-event --userspace tp:tptest \
+ lttng_add_trigger_ok "$user_trigger_name" --owner-uid "$new_uid" \
+ --condition event-rule-matches --type=user --name tp:tptest \
--action notify
# Stop consumption of notifier tracer notifications.
"User trigger discarded notifications number ($user_trigger_discarded_nb) is non-zero"
lttng_remove_trigger_ok "$root_trigger_name"
- lttng_remove_trigger_ok "$user_trigger_name" --user-id "$new_uid"
+ lttng_remove_trigger_ok "$user_trigger_name" --owner-uid "$new_uid"
stop_lttng_sessiond_notap
local sessiond_pipe=()
local root_trigger_name="root_trigger"
local user_trigger_name="user_trigger"
- local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+ local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
local NR_USEC_WAIT=0
local PIPE_SIZE
local NR_ITER
done
lttng_add_trigger_ok "$root_trigger_name" \
- --condition on-event --userspace tp:tptest \
+ --condition event-rule-matches --type=user --name tp:tptest \
--action notify
# Stop consumption of notifier tracer notifications.
skip 0 "Root access is needed. Skipping all kernel notification tests." $KERNEL_NUM_TESTS
fi
-rm -rf "$TMPDIR"
+rm -rf "$TEST_TMPDIR"