Fix: possible null dereference

[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 eb8beb0d800588c58293aeb1471c18a040d3f9a8..3d766780e6fcc8a35e54cf53553cd7fdf6d19e60 100644 (file)
--- 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;
 };
 
 /**
@@ -215,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 */