X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=631948cda93d4a440875a8146fb306d4147edf5a;hb=7344b6a307b62685272f8f5dacc42d4e06e5732f;hp=e995bb657b934ce0f1c2f44526b802b74b6fe9d7;hpb=3780613c550126cdd41a11716eba6d13b5809004;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index e995bb657..631948cda 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -43,7 +43,7 @@
 
 int nb_args = 0;
 int named_pipe_args_start = 0;
-pid_t app_pid = -1;
+pid_t app_pid = 0;
 const char *app_state_file = NULL;
 
 static
@@ -156,6 +156,8 @@ int suspend_application(void)
 	/*
 	 * Send SIGUSR1 to application instructing it to bypass tracepoint.
 	 */
+	assert(app_pid > 1);
+
 	ret = kill(app_pid, SIGUSR1);
 	if (ret) {
 		fail("SIGUSR1 failed. errno %d", errno);
@@ -186,6 +188,8 @@ int resume_application(void)
 		goto error;
 	}
 
+	assert(app_pid > 1);
+
 	ret = kill(app_pid, SIGUSR1);
 	if (ret) {
 		fail("SIGUSR1 failed. errno %d", errno);
@@ -613,7 +617,56 @@ end:
 	return ret;
 }
 
-static void test_notification_channel(const char *session_name,
+static void test_subscription_twice(const char *session_name,
+		const char *channel_name,
+		const enum lttng_domain_type domain_type)
+{
+	int ret = 0;
+	enum lttng_notification_channel_status nc_status;
+
+	struct lttng_action *action = NULL;
+	struct lttng_notification_channel *notification_channel = NULL;
+	struct lttng_trigger *trigger = NULL;
+
+	struct lttng_condition *condition = NULL;
+
+	ret = register_buffer_usage_notify_trigger(session_name, channel_name,
+			domain_type, BUFFER_USAGE_TYPE_LOW, 0.99, &condition,
+			&action, &trigger);
+	if (ret) {
+		fail("Setup error on trigger registration");
+		goto end;
+	}
+
+	/* Begin testing. */
+	notification_channel = lttng_notification_channel_create(
+			lttng_session_daemon_notification_endpoint);
+	ok(notification_channel, "Notification channel object creation");
+	if (!notification_channel) {
+		goto end;
+	}
+
+	/* Subscribe a valid condition. */
+	nc_status = lttng_notification_channel_subscribe(
+			notification_channel, condition);
+	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
+			"Subscribe to condition");
+
+	/* Subscribing again should fail. */
+	nc_status = lttng_notification_channel_subscribe(
+			notification_channel, condition);
+	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED,
+			"Subscribe to a condition for which subscription was already done");
+
+end:
+	lttng_unregister_trigger(trigger);
+	lttng_trigger_destroy(trigger);
+	lttng_notification_channel_destroy(notification_channel);
+	lttng_action_destroy(action);
+	lttng_condition_destroy(condition);
+}
+
+static void test_buffer_usage_notification_channel(const char *session_name,
 		const char *channel_name,
 		const enum lttng_domain_type domain_type,
 		const char **argv)
@@ -662,23 +715,13 @@ static void test_notification_channel(const char *session_name,
 	nc_status = lttng_notification_channel_subscribe(
 			notification_channel, low_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
-			"Subscribe to condition");
+			"Subscribe to low condition");
 
 	/* Subscribe a valid high condition */
 	nc_status = lttng_notification_channel_subscribe(
 			notification_channel, high_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
-			"Subscribe to condition");
-
-	nc_status = lttng_notification_channel_subscribe(
-			notification_channel, low_condition);
-	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED,
-			"Subscribe to a condition for which subscription was already done");
-
-	nc_status = lttng_notification_channel_subscribe(
-			notification_channel, high_condition);
-	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED,
-			"Subscribe to a condition for which subscription was already done");
+			"Subscribe to high condition");
 
 	resume_application();
 
@@ -858,9 +901,10 @@ int main(int argc, const char *argv[])
 
 	/* Basic error path check. */
 	test_invalid_channel_subscription(domain_type);
+	test_subscription_twice(session_name, channel_name, domain_type);
 
-	diag("Test notification channel api for domain %s", domain_type_string);
-	test_notification_channel(session_name, channel_name, domain_type, argv);
+	diag("Test buffer usage notification channel api for domain %s", domain_type_string);
+	test_buffer_usage_notification_channel(session_name, channel_name, domain_type, argv);
 error:
 	return exit_status();
 }