X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.c;h=461c56d64a870502acd08cb332aa2ffedc05a3f7;hp=8ef3c38cf21996de7014646c51cc4ac2ffb75dfa;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=5d1b02193b8788400b04dee1c53965357f51c52c

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index 8ef3c38cf..461c56d64 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,6 +36,7 @@ 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) {
@@ -53,38 +44,42 @@ static void update_ust_app(int app_sock)
 		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 tokens for the app */
+	ust_app_global_update_tokens(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;
 		}
 		session_lock(sess);
-		if (!sess->ust_session) {
+		if (!sess->active || !sess->ust_session) {
 			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();
+
 }
 
 /*
@@ -144,11 +139,6 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 		uint32_t revents = LTTNG_POLL_GETEV(&events, i);
 		int pollfd = LTTNG_POLL_GETFD(&events, i);
 
-		if (!revents) {
-			/* No activity for this FD (poll implementation). */
-			continue;
-		}
-
 		cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
 				&wait_queue->head, head) {
 			if (pollfd == wait_node->app->sock &&
@@ -309,6 +299,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					}
 					lttng_fd_put(LTTNG_FD_APPS, 1);
 					free(ust_cmd);
+					ust_cmd = NULL;
 					goto error;
 				}
 				CDS_INIT_LIST_HEAD(&wait_node->head);
@@ -323,7 +314,9 @@ static void *thread_dispatch_ust_registration(void *data)
 					}
 					lttng_fd_put(LTTNG_FD_APPS, 1);
 					free(wait_node);
+					wait_node = NULL;
 					free(ust_cmd);
+					ust_cmd = NULL;
 					continue;
 				}
 				/*
@@ -334,6 +327,7 @@ static void *thread_dispatch_ust_registration(void *data)
 				wait_queue.count++;
 
 				free(ust_cmd);
+				ust_cmd = NULL;
 				/*
 				 * We have to continue here since we don't have the notify
 				 * socket and the application MUST be added to the hash table
@@ -354,6 +348,7 @@ static void *thread_dispatch_ust_registration(void *data)
 						wait_queue.count--;
 						app = wait_node->app;
 						free(wait_node);
+						wait_node = NULL;
 						DBG3("UST app notify socket %d is set", ust_cmd->sock);
 						break;
 					}
@@ -372,6 +367,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					lttng_fd_put(LTTNG_FD_APPS, 1);
 				}
 				free(ust_cmd);
+				ust_cmd = NULL;
 			}
 
 			if (app) {
@@ -395,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_trigger_group(app);
+
 				/* Send notify socket through the notify pipe. */
 				ret = send_socket_to_thread(
 						notifiers->apps_cmd_notify_pipe_write_fd,