X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread.h;h=3d766780e6fcc8a35e54cf53553cd7fdf6d19e60;hp=d223789c7abb80f2ee52bc7969e20cc153e3f86c;hb=7ca172c15891d4ff3f711dcc05f991fd2c094bc7;hpb=ea9a44f03f3f6e144b5f7f312eee2a5f7a849ecb

diff --git a/src/bin/lttng-sessiond/notification-thread.h b/src/bin/lttng-sessiond/notification-thread.h
index d223789c7..3d766780e 100644
--- a/src/bin/lttng-sessiond/notification-thread.h
+++ b/src/bin/lttng-sessiond/notification-thread.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef NOTIFICATION_THREAD_H
@@ -27,6 +17,7 @@
 #include <common/hashtable/hashtable.h>
 #include <pthread.h>
 #include <semaphore.h>
+#include "thread.h"
 
 struct notification_thread_handle {
 	/*
@@ -48,10 +39,8 @@ struct notification_thread_handle {
 		int ust64_consumer;
 		int kernel_consumer;
 	} channel_monitoring_pipes;
-	/*
-	 * To inform the rotation thread we are ready.
-	 */
-	sem_t *notification_thread_ready;
+	/* Used to wait for the launch of the notification thread. */
+	sem_t ready;
 };
 
 /**
@@ -120,12 +109,14 @@ struct notification_thread_handle {
  *   3) registration of a trigger,
  *   4) unregistration of a trigger,
  *   5) reception of a channel monitor sample from the consumer daemon.
+ *   6) Session rotation ongoing
+ *   7) Session rotation completed
  *
  * Events specific to notification-emitting triggers:
- *   6) connection of a notification client,
- *   7) disconnection of a notification client,
- *   8) subscription of a client to a conditions' notifications,
- *   9) unsubscription of a client from a conditions' notifications,
+ *   8) connection of a notification client,
+ *   9) disconnection of a notification client,
+ *   10) subscription of a client to a conditions' notifications,
+ *   11) unsubscription of a client from a conditions' notifications,
  *
  *
  * 1) Creation of a tracing channel
@@ -172,22 +163,26 @@ struct notification_thread_handle {
  *        "notify", query the notification_trigger_clients_ht and send
  *        a notification to the clients.
  *
- * 6) Connection of a client
+ * 6) Session rotation ongoing
+ *
+ * 7) Session rotation completed
+ *
+ * 8) Connection of a client
  *    - add client socket to the client_socket_ht.
  *
- * 7) Disconnection of a client
+ * 9) Disconnection of a client
  *    - 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.
  *
- * 8) Subscription of a client to a condition's notifications
+ * 10) Subscription of a client to a condition's notifications
  *    - Add the condition to the client's list of subscribed conditions,
  *    - Look-up notification_trigger_clients_ht and add the client to
  *      list of clients.
  *    - Evaluate the condition for the client that subscribed if the trigger
  *      was already registered.
  *
- * 9) Unsubscription of a client to a condition's notifications
+ * 11) Unsubscription of a client to a condition's notifications
  *    - Remove the condition from the client's list of subscribed conditions,
  *    - Look-up notification_trigger_clients_ht and remove the client
  *      from the list of clients.
@@ -209,11 +204,10 @@ struct notification_thread_state {
 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,
-		sem_t *notification_thread_ready);
+		struct lttng_pipe *kernel_channel_monitor_pipe);
 void notification_thread_handle_destroy(
 		struct notification_thread_handle *handle);
-
-void *thread_notification(void *data);
+struct lttng_thread *launch_notification_thread(
+		struct notification_thread_handle *handle);
 
 #endif /* NOTIFICATION_THREAD_H */