X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=d8a88bf2135516c2c11dc655139712fd447944b9;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hp=6c52bed01d864f8f40e574cd266dd0e5648584f8;hpb=854382b8a0f18fa77ba97eac55a61dd8d8d8cc85;p=lttng-tools.git diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index 6c52bed01..d8a88bf21 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -5,23 +5,8 @@ * * Copyright (C) 2017 Jonathan Rajotte * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #include @@ -50,6 +35,7 @@ #include #include #include +#include #include @@ -374,6 +360,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; @@ -555,10 +552,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID, "Subscribing to an invalid condition"); nc_status = lttng_notification_channel_unsubscribe(notification_channel, dummy_invalid_condition); - ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID, "Unsubscribing to an invalid condition"); + ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID, "Unsubscribing from an invalid condition"); nc_status = lttng_notification_channel_unsubscribe(notification_channel, dummy_condition); - ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_UNKNOWN_CONDITION, "Unsubscribing to an valid unknown condition"); + ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_UNKNOWN_CONDITION, "Unsubscribing from a valid unknown condition"); /* Subscribe a valid low condition */ nc_status = lttng_notification_channel_subscribe(notification_channel, low_condition); @@ -575,8 +572,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, ¬ification); @@ -588,8 +585,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 +609,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, ¬ification); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && @@ -623,9 +621,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, ¬ification); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && @@ -634,10 +632,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, ¬ification); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && @@ -647,8 +645,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");