NR_ITER=5
NR_USEC_WAIT=5
-function lttng_add_trigger_ust()
-{
- local expected_to_fail="$1"
- local trigger_name="$2"
- shift 2
-
- "$FULL_LTTNG_BIN" add-trigger --id "$trigger_name" "$@" 1> /dev/null 2> /dev/null
- ret=$?
- if [[ $expected_to_fail -eq "1" ]]; then
- test "$ret" -ne "0"
- ok $? "Add trigger $trigger_name failed as expected"
- else
- ok $ret "Add trigger $trigger_name"
- fi
-}
-
-function lttng_remove_trigger_ust()
-{
- local expected_to_fail="$1"
- local trigger_name="$2"
-
- "$FULL_LTTNG_BIN" remove-trigger "$trigger_name" 1> /dev/null 2> /dev/null
- ret=$?
- if [[ $expected_to_fail -eq "1" ]]; then
- test "$ret" -ne "0"
- ok $? "Remove trigger $trigger_name failed as expected"
- else
- ok $ret "Remove trigger $trigger_name"
- fi
-}
-
-function lttng_add_trigger_ust_ok()
-{
- lttng_add_trigger_ust 0 "$@"
-}
-
-function lttng_remove_trigger_ust_ok()
-{
- lttng_remove_trigger_ust 0 "$@"
-}
-
function lttng_session_is_active()
{
local SESSION_NAME="$1"
local SESSION_NAME="my_triggered_session"
local TRIGGER_NAME="trigger1"
local TRACE_PATH=$(mktemp -d test-start-action-trace.XXXXXX)
- local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp test-notif-register.XXXXXX)
+ local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u test-notif-register.XXXXXX)
diag "Start session action"
# Add `start-session` action to an event-rule condition _followed_ by
# a `notify` action.
- lttng_add_trigger_ust_ok \
+ lttng_add_trigger_ok \
$TRIGGER_NAME \
- --condition on-event -u "tp:tptest" \
+ --condition event-rule-matches -u "tp:tptest" \
--action start-session $SESSION_NAME \
--action notify
# Launch notification listener.
$NOTIFICATION_CLIENT_BIN \
--trigger $TRIGGER_NAME \
- --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH"
+ --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH" &
notif_client_pid=$!
while [ ! -f "${SYNC_AFTER_NOTIF_REGISTER_PATH}" ]; do
lttng_session_is_active $SESSION_NAME
# Tearing down.
- lttng_remove_trigger_ust_ok $TRIGGER_NAME
+ lttng_remove_trigger_ok $TRIGGER_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
local SESSION_NAME="my_triggered_session"
local TRIGGER_NAME="trigger1"
local TRACE_PATH=$(mktemp -d test-stop-action-trace.XXXXXX)
- local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp test-notif-register.XXXXXX)
+ local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u test-notif-register.XXXXXX)
diag "Stop session action"
create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
# Add `stop-session` action to an event-rule condition _followed_ by
# a `notify` action.
- lttng_add_trigger_ust_ok \
+ lttng_add_trigger_ok \
$TRIGGER_NAME \
- --condition on-event -u "tp:tptest" \
+ --condition event-rule-matches -u "tp:tptest" \
--action stop-session $SESSION_NAME \
--action notify
# Launch notification listener.
$NOTIFICATION_CLIENT_BIN \
--trigger $TRIGGER_NAME \
- --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH"
+ --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH" &
notif_client_pid=$!
while [ ! -f "${SYNC_AFTER_NOTIF_REGISTER_PATH}" ]; do
lttng_session_is_inactive $SESSION_NAME
# Tearing down.
- lttng_remove_trigger_ust_ok $TRIGGER_NAME
+ lttng_remove_trigger_ok $TRIGGER_NAME
destroy_lttng_session_ok $SESSION_NAME
rm -f "$SYNC_AFTER_NOTIF_REGISTER_PATH"