Fix: circular inclusion of lttng.h results in warning

[lttng-tools.git] / tests / regression / tools / notification / notification.c

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 6c52bed01d864f8f40e574cd266dd0e5648584f8..7af9258f983b4062dd52e088342f849c6edab27b 100644 (file)
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -50,6 +50,7 @@
 #include <lttng/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>
+#include <lttng/lttng.h>
 
 #include <tap/tap.h>
 
@@ -374,6 +375,17 @@ end:
        lttng_action_destroy(action);
 }
 
+static
+void wait_data_pending(const char *session_name)
+{
+       int ret;
+
+       do {
+               ret = lttng_data_pending(session_name);
+               assert(ret >= 0);
+       } while (ret != 0);
+}
+
 void test_notification_channel(const char *session_name, const char *channel_name, const enum lttng_domain_type domain_type, const char **argv)
 {
        int ret = 0;
@@ -575,8 +587,8 @@ void test_notification_channel(const char *session_name, const char *channel_nam
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED, "Subscribe to a condition for which subscription was already done");
 
        /* Wait for notification to happen */
-       lttng_start_tracing(session_name);
        stop_consumer(argv);
+       lttng_start_tracing(session_name);
 
        /* Wait for high notification */
        nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
@@ -588,8 +600,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
        notification = NULL;
 
        suspend_application();
+       lttng_stop_tracing_no_wait(session_name);
        resume_consumer(argv);
-       lttng_stop_tracing(session_name);
+       wait_data_pending(session_name);
 
        /*
         * Test that communication still work even if there is notification
@@ -611,9 +624,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
        notification = NULL;
 
        /* Stop consumer to force a high notification */
+       stop_consumer(argv);
        resume_application();
        lttng_start_tracing(session_name);
-       stop_consumer(argv);
 
        nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
@@ -623,9 +636,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
        notification = NULL;
 
        suspend_application();
-       /* Resume consumer to allow event consumption */
+       lttng_stop_tracing_no_wait(session_name);
        resume_consumer(argv);
-       lttng_stop_tracing(session_name);
+       wait_data_pending(session_name);
 
        nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
@@ -634,10 +647,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
        lttng_notification_destroy(notification);
        notification = NULL;
 
+       stop_consumer(argv);
        resume_application();
        /* Stop consumer to force a high notification */
        lttng_start_tracing(session_name);
-       stop_consumer(argv);
 
        nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
@@ -647,8 +660,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
        notification = NULL;
 
        /* Resume consumer to allow event consumption */
+       suspend_application();
+       lttng_stop_tracing_no_wait(session_name);
        resume_consumer(argv);
-       lttng_stop_tracing(session_name);
+       wait_data_pending(session_name);
 
        nc_status = lttng_notification_channel_unsubscribe(notification_channel, low_condition);
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK, "Unsubscribe low condition with pending notification");