X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread.c;h=0c2d0d294628e2aea442498592ec1f379b15727a;hp=8c2892bda85e9905f642f26d61c5c6eaf26dfeb7;hb=242388e491e4219f967ee424d7bf02035a313e6f;hpb=ea6bf30f3684cf71633cb9f2c70ea0bc22b664c4

diff --git a/src/bin/lttng-sessiond/notification-thread.c b/src/bin/lttng-sessiond/notification-thread.c
index 8c2892bda..0c2d0d294 100644
--- a/src/bin/lttng-sessiond/notification-thread.c
+++ b/src/bin/lttng-sessiond/notification-thread.c
@@ -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.
  */
 
 #define _LGPL_SOURCE
@@ -27,7 +17,6 @@
 #include <common/utils.h>
 #include <common/align.h>
 #include <common/time.h>
-#include <sys/eventfd.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <signal.h>
@@ -172,7 +161,7 @@ char *get_notification_channel_sock_path(void)
 			goto error;
 		}
 	} else {
-		char *home_path = utils_get_home_dir();
+		const char *home_path = utils_get_home_dir();
 
 		if (!home_path) {
 			ERR("Can't get HOME directory for socket creation");
@@ -342,6 +331,10 @@ void fini_thread_state(struct notification_thread_state *state)
 		ret = cds_lfht_destroy(state->client_socket_ht, NULL);
 		assert(!ret);
 	}
+	if (state->client_id_ht) {
+		ret = cds_lfht_destroy(state->client_id_ht, NULL);
+		assert(!ret);
+	}
 	if (state->triggers_ht) {
 		ret = handle_notification_thread_trigger_unregister_all(state);
 		assert(!ret);
@@ -369,6 +362,10 @@ void fini_thread_state(struct notification_thread_state *state)
 		ret = cds_lfht_destroy(state->sessions_ht, NULL);
 		assert(!ret);
 	}
+	if (state->triggers_by_name_uid_ht) {
+		ret = cds_lfht_destroy(state->triggers_by_name_uid_ht, NULL);
+		assert(!ret);
+	}
 	/*
 	 * Must be destroyed after all channels have been destroyed.
 	 * See comment in struct lttng_session_trigger_list.
@@ -381,6 +378,9 @@ void fini_thread_state(struct notification_thread_state *state)
 		notification_channel_socket_destroy(
 				state->notification_channel_socket);
 	}
+	if (state->executor) {
+		action_executor_destroy(state->executor);
+	}
 	lttng_poll_clean(&state->events);
 }
 
@@ -434,6 +434,12 @@ int init_thread_state(struct notification_thread_handle *handle,
 		goto error;
 	}
 
+	state->client_id_ht = cds_lfht_new(DEFAULT_HT_SIZE, 1, 0,
+			CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
+	if (!state->client_id_ht) {
+		goto error;
+	}
+
 	state->channel_triggers_ht = cds_lfht_new(DEFAULT_HT_SIZE, 1, 0,
 			CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
 	if (!state->channel_triggers_ht) {
@@ -473,6 +479,16 @@ int init_thread_state(struct notification_thread_handle *handle,
 	if (!state->triggers_ht) {
 		goto error;
 	}
+	state->triggers_by_name_uid_ht = cds_lfht_new(DEFAULT_HT_SIZE,
+			1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
+	if (!state->triggers_by_name_uid_ht) {
+		goto error;
+	}
+
+	state->executor = action_executor_create(handle);
+	if (!state->executor) {
+		goto error;
+	}
 	mark_thread_as_ready(handle);
 end:
 	return 0;
@@ -530,15 +546,15 @@ void *thread_notification(void *data)
 
 	DBG("[notification-thread] Started notification thread");
 
+	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
+	rcu_register_thread();
+	rcu_thread_online();
+
 	if (!handle) {
 		ERR("[notification-thread] Invalid thread context provided");
 		goto end;
 	}
 
-	rcu_register_thread();
-	rcu_thread_online();
-
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
 	health_code_update();
 
 	ret = init_thread_state(handle, &state);
@@ -642,10 +658,10 @@ void *thread_notification(void *data)
 exit:
 error:
 	fini_thread_state(&state);
-	health_unregister(health_sessiond);
+end:
 	rcu_thread_offline();
 	rcu_unregister_thread();
-end:
+	health_unregister(health_sessiond);
 	return NULL;
 }