X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=364d41895bb78531f61b20a1842bfe4a02960680;hp=d8a88bf2135516c2c11dc655139712fd447944b9;hb=67c93c15b77fa2089110ade9d493b17df6e90fc2;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33 diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index d8a88bf21..364d41895 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -59,19 +59,35 @@ 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; + } } } +static int write_pipe(const char *path, uint8_t data) { int ret = 0; @@ -103,25 +119,30 @@ end: return ret; } +static int stop_consumer(const char **argv) { - int ret = 0; - for (int i = named_pipe_args_start; i < nb_args; i++) { + int ret = 0, i; + + for (i = named_pipe_args_start; i < nb_args; i++) { ret = write_pipe(argv[i], 49); } return ret; } +static int resume_consumer(const char **argv) { - int ret = 0; - for (int i = named_pipe_args_start; i < nb_args; i++) { + int ret = 0, i; + + for (i = named_pipe_args_start; i < nb_args; i++) { ret = write_pipe(argv[i], 0); } return ret; } -int suspend_application() +static +int suspend_application(void) { int ret; struct stat buf; @@ -149,6 +170,7 @@ error: } +static int resume_application() { int ret; @@ -179,11 +201,13 @@ error: } +static void test_triggers_buffer_usage_condition(const char *session_name, const char *channel_name, enum lttng_domain_type domain_type, enum lttng_condition_type condition_type) { + unsigned int test_vector_size = 5, i; enum lttng_condition_status condition_status; struct lttng_action *action; @@ -198,8 +222,8 @@ void test_triggers_buffer_usage_condition(const char *session_name, ok(lttng_register_trigger(NULL) == -LTTNG_ERR_INVALID, "Registering a NULL trigger fails as expected"); /* Test: register a trigger */ - unsigned int test_vector_size = 5; - for (unsigned int i = 0; i < pow(2,test_vector_size); i++) { + + for (i = 0; i < pow(2,test_vector_size); i++) { int loop_ret = 0; char *test_tuple_string = NULL; unsigned int mask_position = 0; @@ -297,7 +321,7 @@ void test_triggers_buffer_usage_condition(const char *session_name, assert("Logic error for test vector generation"); } - loop_ret = asprintf(&test_tuple_string, "session name %s, channel name %s, threshold ratio %s, threshold byte %s, domain type %s", + loop_ret = asprintf(&test_tuple_string, "session name %s, channel name %s, threshold ratio %s, threshold byte %s, domain type %s", session_name_set ? "set" : "unset", channel_name_set ? "set" : "unset", threshold_ratio_set ? "set" : "unset", @@ -345,7 +369,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); } @@ -371,6 +395,7 @@ void wait_data_pending(const char *session_name) } while (ret != 0); } +static 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; @@ -576,7 +601,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam 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, @@ -600,7 +627,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, @@ -613,7 +642,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam resume_application(); lttng_start_tracing(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_HIGH, "High notification received after intermediary communication"); @@ -625,7 +656,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam resume_consumer(argv); 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"); @@ -637,7 +670,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam /* Stop consumer to force a high notification */ lttng_start_tracing(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_HIGH, "High notification");