X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread.h;h=2afcfe15f62afca0d6177a2845742ccbfb90caf2;hp=21cc086c6ee8ec9c2db4b7b9c0daceee28ab1b99;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=ae0a823f9f7e1d3800479488a58efc2f92f27d89

diff --git a/src/bin/lttng-sessiond/notification-thread.h b/src/bin/lttng-sessiond/notification-thread.h
index 21cc086c6..2afcfe15f 100644
--- a/src/bin/lttng-sessiond/notification-thread.h
+++ b/src/bin/lttng-sessiond/notification-thread.h
@@ -8,20 +8,35 @@
 #ifndef NOTIFICATION_THREAD_H
 #define NOTIFICATION_THREAD_H
 
-#include <urcu/list.h>
-#include <urcu.h>
-#include <urcu/rculfhash.h>
-#include <lttng/trigger/trigger.h>
-#include <common/pipe.h>
+#include "action-executor.h"
+#include "thread.h"
 #include <common/compat/poll.h>
 #include <common/hashtable/hashtable.h>
+#include <common/pipe.h>
+#include <lttng/trigger/trigger.h>
+#include <lttng/domain.h>
 #include <pthread.h>
 #include <semaphore.h>
-#include "thread.h"
-
+#include <urcu.h>
+#include <urcu/list.h>
+#include <urcu/rculfhash.h>
 
 typedef uint64_t notification_client_id;
 
+struct notification_event_trigger_source_element {
+	int fd;
+	enum lttng_domain_type domain;
+	struct cds_list_head node;
+};
+
+struct notification_trigger_tokens_ht_element {
+    uint64_t token;
+    struct lttng_trigger *trigger;
+    struct cds_lfht_node node;
+    /* call_rcu delayed reclaim. */
+    struct rcu_head rcu_node;
+};
+
 struct notification_thread_handle {
 	/*
 	 * Queue of struct notification command.
@@ -42,6 +57,15 @@ struct notification_thread_handle {
 		int ust64_consumer;
 		int kernel_consumer;
 	} channel_monitoring_pipes;
+	/*
+	 * Read side of pipes used to reveice event trigger generetated by
+	 * registered applications
+	 */
+	struct {
+		/* List of notification_event_trigger_source_element */
+		struct cds_list_head list;
+		pthread_mutex_t lock;
+	} event_trigger_sources;
 	/* Used to wait for the launch of the notification thread. */
 	sem_t ready;
 };
@@ -107,9 +131,14 @@ struct notification_thread_handle {
  *             channels through their struct channel_info (ref-counting is used).
  *
  *   - triggers_ht:
- *             associates a condition to a struct lttng_trigger_ht_element.
+ *             associates a trigger to a struct lttng_trigger_ht_element.
  *             The hash table holds the ownership of the
  *             lttng_trigger_ht_elements along with the triggers themselves.
+ *   - triggers_by_name_uid_ht:
+ *             associates a trigger (name, uid) tuple to
+ *             a struct lttng_trigger_ht_element.
+ *             The hash table does not hold any ownership and is used strictly
+ *             for lookup on registration.
  *
  * The thread reacts to the following internal events:
  *   1) creation of a tracing channel,
@@ -153,6 +182,7 @@ struct notification_thread_handle {
  *          notification_trigger_clients_ht,
  *    - add trigger to channel_triggers_ht (if applicable),
  *    - add trigger to session_triggers_ht (if applicable),
+ *    - add trigger to triggers_by_name_uid_ht
  *    - add trigger to triggers_ht
  *    - evaluate the trigger's condition right away to react if that condition
  *      is true from the beginning.
@@ -162,6 +192,7 @@ struct notification_thread_handle {
  *      - remove the trigger from the notification_trigger_clients_ht,
  *    - remove trigger from channel_triggers_ht (if applicable),
  *    - remove trigger from session_triggers_ht (if applicable),
+ *    - remove trigger from triggers_by_name_uid_ht
  *    - remove trigger from triggers_ht
  *
  * 5) Reception of a channel monitor sample from the consumer daemon
@@ -209,14 +240,22 @@ struct notification_thread_state {
 	struct cds_lfht *channels_ht;
 	struct cds_lfht *sessions_ht;
 	struct cds_lfht *triggers_ht;
+	struct cds_lfht *triggers_by_name_uid_ht;
+	struct cds_lfht *trigger_tokens_ht;
+	struct {
+		uint64_t token_generator;
+		uint64_t name_offset;
+	} trigger_id;
 	notification_client_id next_notification_client_id;
+	struct action_executor *executor;
 };
 
 /* notification_thread_data takes ownership of the channel monitor pipes. */
 struct notification_thread_handle *notification_thread_handle_create(
 		struct lttng_pipe *ust32_channel_monitor_pipe,
 		struct lttng_pipe *ust64_channel_monitor_pipe,
-		struct lttng_pipe *kernel_channel_monitor_pipe);
+		struct lttng_pipe *kernel_channel_monitor_pipe,
+		int kernel_notification_monitor_fd);
 void notification_thread_handle_destroy(
 		struct notification_thread_handle *handle);
 struct lttng_thread *launch_notification_thread(