X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.c;h=c142e849b3e234703b9dc6102f37f4a01e904ee9;hp=d9fdf01588465a3e826bbc53b3a0e6cb35d29705;hb=8abe313a6c4f251063e4b72ddd47ce8107384d71;hpb=8ada111f6d3ab40d1c33cf1a7b2546de9a47d1d5

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index d9fdf0158..c142e849b 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -44,7 +44,7 @@ int run_command_wait(struct notification_thread_handle *handle,
 	cds_list_add_tail(&cmd->cmd_list_node,
 			&handle->cmd_queue.list);
 	/* Wake-up thread. */
-	ret = write(handle->cmd_queue.event_fd,
+	ret = write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
 			&notification_counter, sizeof(notification_counter));
 	if (ret < 0) {
 		PERROR("write to notification thread's queue event fd");
@@ -123,13 +123,13 @@ enum lttng_error_code notification_thread_command_add_channel(
 	init_notification_thread_command(&cmd);
 
 	cmd.type = NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL;
-	cmd.parameters.add_channel.session_name = session_name;
-	cmd.parameters.add_channel.uid = uid;
-	cmd.parameters.add_channel.gid = gid;
-	cmd.parameters.add_channel.channel_name = channel_name;
-	cmd.parameters.add_channel.key.key = key;
-	cmd.parameters.add_channel.key.domain = domain;
-	cmd.parameters.add_channel.capacity = capacity;
+	cmd.parameters.add_channel.session.name = session_name;
+	cmd.parameters.add_channel.session.uid = uid;
+	cmd.parameters.add_channel.session.gid = gid;
+	cmd.parameters.add_channel.channel.name = channel_name;
+	cmd.parameters.add_channel.channel.key = key;
+	cmd.parameters.add_channel.channel.domain = domain;
+	cmd.parameters.add_channel.channel.capacity = capacity;
 
 	ret = run_command_wait(handle, &cmd);
 	if (ret) {