X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=d620159246a54368d44fa9b9391f4007212c54f6;hp=212746faa1c7a50d67e3006f868908222a00d22c;hb=940786035bcaf18b6b19a6a98f928ad4f52375f4;hpb=2fb5e9b7971e2408dce182fcf7e87cd81dcb388b

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 212746faa..d62015924 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -125,6 +125,19 @@ struct lttng_condition_list_element {
 	struct cds_list_head node;
 };
 
+/*
+ * Facilities to carry the different notifications type in the action processing
+ * code path.
+ */
+struct lttng_event_notifier_notification {
+	union {
+		struct lttng_ust_event_notifier_notification *ust;
+		struct lttng_kernel_event_notifier_notification *kernel;
+	} notification;
+	uint64_t token;
+	enum lttng_domain_type type;
+};
+
 struct channel_state_sample {
 	struct channel_key key;
 	struct cds_lfht_node channel_state_ht_node;
@@ -2670,7 +2683,7 @@ void free_notification_trigger_tokens_ht_element_rcu(struct rcu_head *node)
 static
 int handle_notification_thread_command_unregister_trigger(
 		struct notification_thread_state *state,
-		struct lttng_trigger *trigger,
+		const struct lttng_trigger *trigger,
 		enum lttng_error_code *_cmd_reply)
 {
 	struct cds_lfht_iter iter;
@@ -2678,7 +2691,7 @@ int handle_notification_thread_command_unregister_trigger(
 	struct lttng_channel_trigger_list *trigger_list;
 	struct notification_client_list *client_list;
 	struct lttng_trigger_ht_element *trigger_ht_element = NULL;
-	struct lttng_condition *condition = lttng_trigger_get_condition(
+	const struct lttng_condition *condition = lttng_trigger_get_const_condition(
 			trigger);
 	enum lttng_error_code cmd_reply;
 
@@ -2792,14 +2805,15 @@ int handle_notification_thread_command(
 	switch (cmd->type) {
 	case NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER:
 		DBG("[notification-thread] Received register trigger command");
-		ret = handle_notification_thread_command_register_trigger(
-				state, cmd->parameters.trigger,
+		ret = handle_notification_thread_command_register_trigger(state,
+				cmd->parameters.register_trigger.trigger,
 				&cmd->reply_code);
 		break;
 	case NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER:
 		DBG("[notification-thread] Received unregister trigger command");
 		ret = handle_notification_thread_command_unregister_trigger(
-				state, cmd->parameters.trigger,
+				state,
+				cmd->parameters.unregister_trigger.trigger,
 				&cmd->reply_code);
 		break;
 	case NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL:
@@ -4132,6 +4146,99 @@ end:
 	return ret;
 }
 
+int handle_notification_thread_event_notification(struct notification_thread_state *state,
+		int notification_pipe_read_fd,
+		enum lttng_domain_type domain)
+{
+	int ret;
+	struct lttng_ust_event_notifier_notification ust_notification;
+	struct lttng_kernel_event_notifier_notification kernel_notification;
+	struct cds_lfht_node *node;
+	struct cds_lfht_iter iter;
+	struct notification_trigger_tokens_ht_element *element;
+	enum lttng_action_type action_type;
+	const struct lttng_action *action;
+	struct lttng_event_notifier_notification notification;
+	void *reception_buffer;
+	size_t reception_size;
+
+	notification.type = domain;
+
+	switch(domain) {
+	case LTTNG_DOMAIN_UST:
+		reception_buffer = (void *) &ust_notification;
+		reception_size = sizeof(ust_notification);
+		notification.notification.ust = &ust_notification;
+		break;
+	case LTTNG_DOMAIN_KERNEL:
+		reception_buffer = (void *) &kernel_notification;
+		reception_size = sizeof(kernel_notification);
+		notification.notification.kernel = &kernel_notification;
+		break;
+	default:
+		abort();
+	}
+
+	/*
+	 * The monitoring pipe only holds messages smaller than PIPE_BUF,
+	 * ensuring that read/write of tracer notifications are atomic.
+	 */
+	ret = lttng_read(notification_pipe_read_fd, reception_buffer,
+			reception_size);
+	if (ret != reception_size) {
+		PERROR("Failed to read from event source notification pipe: fd = %d, size to read = %zu, ret = %d",
+				notification_pipe_read_fd, reception_size, ret);
+		ret = -1;
+		goto end;
+	}
+
+	switch(domain) {
+	case LTTNG_DOMAIN_UST:
+		notification.token = ust_notification.token;
+		break;
+	case LTTNG_DOMAIN_KERNEL:
+		notification.token = kernel_notification.token;
+		break;
+	default:
+		abort();
+	}
+
+	/* Find triggers associated with this token. */
+	rcu_read_lock();
+	cds_lfht_lookup(state->trigger_tokens_ht,
+			hash_key_u64(&notification.token, lttng_ht_seed),
+			match_trigger_token, &notification.token, &iter);
+	node = cds_lfht_iter_get_node(&iter);
+	if (caa_likely(!node)) {
+		/*
+		 * This is not an error, slow consumption of the pipe can lead
+		 * to situations where a trigger is removed but we still get
+		 * tracer notification matching to a previous trigger.
+		 */
+		ret = 0;
+		goto end_unlock;
+	}
+
+	element = caa_container_of(node,
+			struct notification_trigger_tokens_ht_element,
+			node);
+
+	action = lttng_trigger_get_const_action(element->trigger);
+	action_type = lttng_action_get_type(action);
+	DBG("Received message from tracer event source: event source fd = %d, token = %" PRIu64 ", action type = '%s'",
+			notification_pipe_read_fd, notification.token,
+			lttng_action_type_string(action_type));
+
+	/* TODO: Perform actions */
+
+	ret = 0;
+
+end_unlock:
+	rcu_read_unlock();
+end:
+	return ret;
+}
+
 int handle_notification_thread_channel_sample(
 		struct notification_thread_state *state, int pipe,
 		enum lttng_domain_type domain)