X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.cpp;h=9690115d66c56ca83b06f6adb6e92e888249ec00;hb=eda1aa02582ba8af1f30d40f131f4a32d2b372ab;hp=0246501a53a31c69bc1ea3a9cddbaec75c67f6d4;hpb=0114db0ec2407029052eb61a0189c9b1cd64d520;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp
index 0246501a5..9690115d6 100644
--- a/src/bin/lttng-sessiond/ust-app.cpp
+++ b/src/bin/lttng-sessiond/ust-app.cpp
@@ -3461,11 +3461,7 @@ static int create_channel_per_uid(struct ust_app *app,
 
 	/* Notify the notification subsystem of the channel's creation. */
 	notification_ret = notification_thread_command_add_channel(
-			the_notification_thread_handle, session->name,
-			lttng_credentials_get_uid(
-					&ua_sess->effective_credentials),
-			lttng_credentials_get_gid(
-					&ua_sess->effective_credentials),
+			the_notification_thread_handle, session->id,
 			ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
 			ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
 	if (notification_ret != LTTNG_OK) {
@@ -3563,11 +3559,7 @@ static int create_channel_per_pid(struct ust_app *app,
 	}
 
 	cmd_ret = notification_thread_command_add_channel(
-			the_notification_thread_handle, session->name,
-			lttng_credentials_get_uid(
-					&ua_sess->effective_credentials),
-			lttng_credentials_get_gid(
-					&ua_sess->effective_credentials),
+			the_notification_thread_handle, session->id,
 			ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
 			ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
 	if (cmd_ret != LTTNG_OK) {
@@ -6434,32 +6426,48 @@ static int handle_app_register_channel_notification(int sock,
 	 * that all apps provide the same typing for the context fields as a
 	 * sanity check.
 	 */
-	lst::type::cuptr context_fields = lttng::make_unique<lst::structure_type>(0,
-			lsu::create_trace_fields_from_ust_ctl_fields(*locked_registry_session,
-					ust_ctl_context_fields.get(), context_field_count));
+	try {
+		auto app_context_fields = lsu::create_trace_fields_from_ust_ctl_fields(
+				*locked_registry_session, ust_ctl_context_fields.get(),
+				context_field_count,
+				lst::field_location::root::EVENT_RECORD_COMMON_CONTEXT);
+
+		if (!ust_reg_chan.is_registered()) {
+			lst::type::cuptr event_context = app_context_fields.size() ?
+					lttng::make_unique<lst::structure_type>(
+							0, std::move(app_context_fields)) :
+					nullptr;
+
+			ust_reg_chan.set_event_context(std::move(event_context));
+		} else {
+			/*
+			 * Validate that the context fields match between
+			 * registry and newcoming application.
+			 */
+			bool context_fields_match;
+			const auto *previous_event_context = ust_reg_chan.get_event_context();
 
-	if (!ust_reg_chan.is_registered()) {
-		ust_reg_chan.set_context(std::move(context_fields));
-	} else {
-		/*
-		 * Validate that the context fields match between
-		 * registry and newcoming application.
-		 */
-		if (ust_reg_chan.get_context() != *context_fields) {
-			ERR("Registering application channel due to context field mismatch: pid = %d, sock = %d",
-				app->pid, app->sock);
-			ret_code = -EINVAL;
-			goto reply;
-		}
-	}
+			if (!previous_event_context) {
+				context_fields_match = app_context_fields.size() == 0;
+			} else {
+				const lst::structure_type app_event_context_struct(
+						0, std::move(app_context_fields));
+
+				context_fields_match = *previous_event_context ==
+						app_event_context_struct;
+			}
 
-	/* Append to metadata */
-	if (!ust_reg_chan._metadata_dumped) {
-		/*ret_code = ust_metadata_channel_statedump(registry, ust_reg_chan);*/
-		if (ret_code) {
-			ERR("Error appending channel metadata (errno = %d)", ret_code);
-			goto reply;
+			if (!context_fields_match) {
+				ERR("Registering application channel due to context field mismatch: pid = %d, sock = %d",
+						app->pid, app->sock);
+				ret_code = -EINVAL;
+				goto reply;
+			}
 		}
+	} catch (std::exception& ex) {
+		ERR("Failed to handle application context: %s", ex.what());
+		ret_code = -EINVAL;
+		goto reply;
 	}
 
 reply:
@@ -6468,7 +6476,7 @@ reply:
 			ret_code);
 
 	ret = lttng_ust_ctl_reply_register_channel(sock, chan_id,
-			ust_reg_chan.header_type == lst::stream_class::header_type::COMPACT ?
+			ust_reg_chan.header_type_ == lst::stream_class::header_type::COMPACT ?
 					LTTNG_UST_CTL_CHANNEL_HEADER_COMPACT :
 					      LTTNG_UST_CTL_CHANNEL_HEADER_LARGE,
 			ret_code);
@@ -6556,12 +6564,14 @@ static int add_event_ust_registry(int sock, int sobjd, int cobjd, const char *na
 				channel.add_event(sobjd, cobjd, name, signature.get(),
 						lsu::create_trace_fields_from_ust_ctl_fields(
 								*locked_registry, fields.get(),
-								nr_fields),
+								nr_fields,
+								lst::field_location::root::
+										EVENT_RECORD_PAYLOAD),
 						loglevel_value,
 						model_emf_uri.get() ?
 								nonstd::optional<std::string>(
 										model_emf_uri.get()) :
-								      nonstd::nullopt,
+								nonstd::nullopt,
 						ua_sess->buffer_type, *app, event_id);
 				ret_code = 0;
 			} catch (const std::exception& ex) {