Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / tests / regression / tools / trigger / utils / register-some-triggers.c

diff --git a/tests/regression/tools/trigger/utils/register-some-triggers.c b/tests/regression/tools/trigger/utils/register-some-triggers.c
index e462b9afc04fed3806a5dc0552266ec5af2dbf1d..54eb78303348cbe3b8675a3a45193904e2e8b376 100644 (file)
--- a/tests/regression/tools/trigger/utils/register-some-triggers.c
+++ b/tests/regression/tools/trigger/utils/register-some-triggers.c
@@ -11,7 +11,6 @@
 #include <common/macros.h>
 #include <lttng/lttng.h>
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -20,34 +19,31 @@ static void register_trigger(const char *trigger_name,
                struct lttng_action *action)
 {
        struct lttng_trigger *trigger;
-       enum lttng_trigger_status trigger_status;
-       int ret;
+       enum lttng_error_code ret;
 
        trigger = lttng_trigger_create(condition, action);
-       trigger_status = lttng_trigger_set_name(trigger, trigger_name);
-       assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
-       ret = lttng_register_trigger(trigger);
-       assert(ret == 0);
+       ret = lttng_register_trigger_with_name(trigger, trigger_name);
+       LTTNG_ASSERT(ret == LTTNG_OK);
 }
 
 /*
- * Register a trigger with the given condition and an action group containing a
+ * Register a trigger with the given condition and an action list containing a
  * single notify action.
  */
-static void register_trigger_action_group_notify(
+static void register_trigger_action_list_notify(
                const char *trigger_name, struct lttng_condition *condition)
 {
        struct lttng_action *action_notify;
-       struct lttng_action *action_group;
+       struct lttng_action *action_list;
        enum lttng_action_status action_status;
 
-       action_group = lttng_action_group_create();
+       action_list = lttng_action_list_create();
        action_notify = lttng_action_notify_create();
-       action_status = lttng_action_group_add_action(
-                       action_group, action_notify);
-       assert(action_status == LTTNG_ACTION_STATUS_OK);
+       action_status = lttng_action_list_add_action(
+                       action_list, action_notify);
+       LTTNG_ASSERT(action_status == LTTNG_ACTION_STATUS_OK);
 
-       register_trigger(trigger_name, condition, action_group);
+       register_trigger(trigger_name, condition, action_list);
 }
 
 static struct lttng_condition *create_session_consumed_size_condition(
@@ -60,17 +56,17 @@ static struct lttng_condition *create_session_consumed_size_condition(
        condition_status =
                        lttng_condition_session_consumed_size_set_session_name(
                                        condition, session_name);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
        condition_status = lttng_condition_session_consumed_size_set_threshold(
                        condition, threshold);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 
        return condition;
 }
 
 static void test_session_consumed_size_condition(void)
 {
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-session-consumed-size-condition",
                        create_session_consumed_size_condition(
                                        "the-session-name", 1234));
@@ -85,13 +81,13 @@ static void fill_buffer_usage_condition(struct lttng_condition *condition,
 
        condition_status = lttng_condition_buffer_usage_set_session_name(
                        condition, session_name);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
        condition_status = lttng_condition_buffer_usage_set_channel_name(
                        condition, channel_name);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
        condition_status = lttng_condition_buffer_usage_set_domain_type(
                        condition, domain_type);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static void fill_buffer_usage_bytes_condition(struct lttng_condition *condition,
@@ -106,7 +102,7 @@ static void fill_buffer_usage_bytes_condition(struct lttng_condition *condition,
                        condition, session_name, channel_name, domain_type);
        condition_status = lttng_condition_buffer_usage_set_threshold(
                        condition, threshold);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static void fill_buffer_usage_ratio_condition(struct lttng_condition *condition,
@@ -121,7 +117,7 @@ static void fill_buffer_usage_ratio_condition(struct lttng_condition *condition,
                        condition, session_name, channel_name, domain_type);
        condition_status = lttng_condition_buffer_usage_set_threshold_ratio(
                        condition, ratio);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static struct lttng_condition *create_buffer_usage_high_bytes_condition(
@@ -186,25 +182,25 @@ static struct lttng_condition *create_buffer_usage_low_ratio_condition(
 
 static void test_buffer_usage_conditions(void)
 {
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-buffer-usage-high-bytes-condition",
                        create_buffer_usage_high_bytes_condition(
                                        "the-session-name", "the-channel-name",
                                        LTTNG_DOMAIN_UST, 1234));
 
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-buffer-usage-low-bytes-condition",
                        create_buffer_usage_low_bytes_condition(
                                        "the-session-name", "the-channel-name",
                                        LTTNG_DOMAIN_UST, 2345));
 
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-buffer-usage-high-ratio-condition",
                        create_buffer_usage_high_ratio_condition(
                                        "the-session-name", "the-channel-name",
                                        LTTNG_DOMAIN_UST, 0.25));
 
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-buffer-usage-low-ratio-condition",
                        create_buffer_usage_low_ratio_condition(
                                        "the-session-name", "the-channel-name",
@@ -218,7 +214,7 @@ static void fill_session_rotation_condition(
 
        condition_status = lttng_condition_session_rotation_set_session_name(
                        condition, session_name);
-       assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+       LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static struct lttng_condition *create_session_rotation_ongoing_condition(
@@ -247,12 +243,12 @@ static struct lttng_condition *create_session_rotation_completed_condition(
 
 static void test_session_rotation_conditions(void)
 {
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-session-rotation-ongoing-condition",
                        create_session_rotation_ongoing_condition(
                                        "the-session-name"));
 
-       register_trigger_action_group_notify(
+       register_trigger_action_list_notify(
                        "trigger-with-session-rotation-completed-condition",
                        create_session_rotation_completed_condition(
                                        "the-session-name"));