X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.c;h=22380fcdd58d4f1cdc878be9096ad8bf93a05db5;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=bfe4455b59a9813174469e14c0688d3bddc1d942;hpb=58f835e108c72cf830c4bc3d5b6abce80ebb0b6c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index bfe4455b5..22380fcdd 100644
--- a/src/bin/lttng-sessiond/dispatch.c
+++ b/src/bin/lttng-sessiond/dispatch.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 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.
  */
 
 #include <stddef.h>
@@ -46,17 +36,33 @@ static void update_ust_app(int app_sock)
 {
 	struct ltt_session *sess, *stmp;
 	const struct ltt_session_list *session_list = session_get_list();
+	struct ust_app *app;
 
 	/* Consumer is in an ERROR state. Stop any application update. */
-	if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+	if (uatomic_read(&the_ust_consumerd_state) == CONSUMER_ERROR) {
 		/* Stop the update process since the consumer is dead. */
 		return;
 	}
 
+	rcu_read_lock();
+	assert(app_sock >= 0);
+	app = ust_app_find_by_sock(app_sock);
+	if (app == NULL) {
+		/*
+		 * Application can be unregistered before so
+		 * this is possible hence simply stopping the
+		 * update.
+		 */
+		DBG3("UST app update failed to find app sock %d",
+			app_sock);
+		goto unlock_rcu;
+	}
+
+	/* Update all event notifiers for the app. */
+	ust_app_global_update_event_notifier_rules(app);
+
 	/* For all tracing session(s) */
 	cds_list_for_each_entry_safe(sess, stmp, &session_list->head, list) {
-		struct ust_app *app;
-
 		if (!session_get(sess)) {
 			continue;
 		}
@@ -65,26 +71,14 @@ static void update_ust_app(int app_sock)
 			goto unlock_session;
 		}
 
-		rcu_read_lock();
-		assert(app_sock >= 0);
-		app = ust_app_find_by_sock(app_sock);
-		if (app == NULL) {
-			/*
-			 * Application can be unregistered before so
-			 * this is possible hence simply stopping the
-			 * update.
-			 */
-			DBG3("UST app update failed to find app sock %d",
-				app_sock);
-			goto unlock_rcu;
-		}
 		ust_app_global_update(sess->ust_session, app);
-	unlock_rcu:
-		rcu_read_unlock();
 	unlock_session:
 		session_unlock(sess);
 		session_put(sess);
 	}
+
+unlock_rcu:
+	rcu_read_unlock();
 }
 
 /*
@@ -241,7 +235,8 @@ static void *thread_dispatch_ust_registration(void *data)
 
 	rcu_register_thread();
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
+	health_register(the_health_sessiond,
+			HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
 
 	if (testpoint(sessiond_thread_app_reg_dispatch)) {
 		goto error_testpoint;
@@ -396,6 +391,8 @@ static void *thread_dispatch_ust_registration(void *data)
 				/* Set app version. This call will print an error if needed. */
 				(void) ust_app_version(app);
 
+				(void) ust_app_setup_event_notifier_group(app);
+
 				/* Send notify socket through the notify pipe. */
 				ret = send_socket_to_thread(
 						notifiers->apps_cmd_notify_pipe_write_fd,
@@ -490,7 +487,7 @@ error_testpoint:
 		health_error();
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 	rcu_unregister_thread();
 	return NULL;
 }