X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=89e3d9ef26beb848b4292d93596ebe7193cf4b2e;hb=4a5ce57c0329b9e4593c007363e436c49e390978;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..89e3d9ef2 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -73,16 +74,31 @@ void wait_on_file(const char *path, bool file_exist) ret = stat(path, &buf); if (ret == -1 && errno == ENOENT) { if (file_exist) { - (void) poll(NULL, 0, 10); /* 10 ms delay */ - continue; /* retry */ + /* + * The file does not exist. wait a bit and + * continue looping until it does. + */ + (void) poll(NULL, 0, 10); + continue; } - break; /* File does not exist */ + + /* + * File does not exist and the exit condition we want. + * Break from the loop and return. + */ + break; } if (ret) { perror("stat"); exit(EXIT_FAILURE); } - break; /* found */ + /* + * stat() returned 0, so the file exists. break now only if + * that's the exit condition we want. + */ + if (file_exist) { + break; + } } } @@ -359,7 +375,7 @@ loop_end: * registered trigger fail. */ loop_ret = lttng_unregister_trigger(trigger); - ok(loop_ret == -LTTNG_ERR_TRIGGER_NOT_FOUND, "Unregister of a non-registerd trigger fails as expected: %s", test_tuple_string); + ok(loop_ret == -LTTNG_ERR_TRIGGER_NOT_FOUND, "Unregister of a non-registered trigger fails as expected: %s", test_tuple_string); } else { ok(loop_ret == -LTTNG_ERR_INVALID_TRIGGER, "Trigger is invalid as expected and cannot be registered: %s", test_tuple_string); } @@ -374,6 +390,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 +582,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,11 +602,13 @@ 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); + do { + nc_status = lttng_notification_channel_get_next_notification(notification_channel, ¬ification); + } while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH, @@ -588,8 +617,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 @@ -602,7 +632,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam nc_status = lttng_notification_channel_subscribe(notification_channel, low_condition); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK, "subscribe with pending notification"); - nc_status = lttng_notification_channel_get_next_notification(notification_channel, ¬ification); + do { + nc_status = lttng_notification_channel_get_next_notification(notification_channel, ¬ification); + } while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW, @@ -611,11 +643,13 @@ 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); + do { + nc_status = lttng_notification_channel_get_next_notification(notification_channel, ¬ification); + } while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH, "High notification received after intermediary communication"); @@ -623,23 +657,27 @@ 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); + do { + nc_status = lttng_notification_channel_get_next_notification(notification_channel, ¬ification); + } while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW, "Low notification received after re-subscription"); 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); + do { + nc_status = lttng_notification_channel_get_next_notification(notification_channel, ¬ification); + } while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED); ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification && lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH, "High notification"); @@ -647,8 +685,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");