sessiond: trigger: run trigger actions through an action executor

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread.h

diff --git a/src/bin/lttng-sessiond/notification-thread.h b/src/bin/lttng-sessiond/notification-thread.h
index 3d766780e6fcc8a35e54cf53553cd7fdf6d19e60..134804f9d0718a76415e898f556e612921c95f9f 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread.h
+++ b/src/bin/lttng-sessiond/notification-thread.h
@@ -8,16 +8,20 @@
 #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 <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_thread_handle {
        /*
@@ -49,9 +53,14 @@ struct notification_thread_handle {
  * In order to speed-up and simplify queries, hash tables providing the
  * following associations are maintained:
  *
- *   - client_socket_ht: associate a client's socket (fd) to its "struct client"
- *             This hash table owns the "struct client" which must thus be
- *             disposed-of on removal from the hash table.
+ *   - client_socket_ht: associate a client's socket (fd) to its
+ *             "struct notification_client".
+ *             This hash table owns the "struct notification_client" which must
+ *             thus be disposed-of on removal from the hash table.
+ *
+ *   - client_id_ht: associate a client's id to its "struct notification_client"
+ *             This hash table holds a _weak_ reference to the
+ *             "struct notification_client".
  *
  *   - channel_triggers_ht:
  *             associates a channel key to a list of
@@ -168,9 +177,11 @@ struct notification_thread_handle {
  * 7) Session rotation completed
  *
  * 8) Connection of a client
- *    - add client socket to the client_socket_ht.
+ *    - add client socket to the client_socket_ht,
+ *    - add client socket to the client_id_ht.
  *
  * 9) Disconnection of a client
+ *    - remove client socket from the client_id_ht,
  *    - remove client socket from the client_socket_ht,
  *    - traverse all conditions to which the client is subscribed and remove
  *      the client from the notification_trigger_clients_ht.
@@ -191,6 +202,7 @@ struct notification_thread_state {
        int notification_channel_socket;
        struct lttng_poll_event events;
        struct cds_lfht *client_socket_ht;
+       struct cds_lfht *client_id_ht;
        struct cds_lfht *channel_triggers_ht;
        struct cds_lfht *session_triggers_ht;
        struct cds_lfht *channel_state_ht;
@@ -198,6 +210,8 @@ struct notification_thread_state {
        struct cds_lfht *channels_ht;
        struct cds_lfht *sessions_ht;
        struct cds_lfht *triggers_ht;
+       notification_client_id next_notification_client_id;
+       struct action_executor *executor;
 };
 
 /* notification_thread_data takes ownership of the channel monitor pipes. */