X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=184dd494c74cfa29fe3408da36f94085df91b3ca;hb=9449cc7574c27419ac4424b4653a6f4428d01b4d;hp=f72d4bb17a3c353a31b4f55ac49aaedc87744eef;hpb=4b35a6b3dbbaf925b2cb95ab36bef3546334607a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index f72d4bb17..184dd494c 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -584,7 +584,7 @@ close_sock:
 static int send_consumer_relayd_sockets(int domain,
 		struct ltt_session *session, struct consumer_output *consumer, int fd)
 {
-	int ret;
+	int ret = LTTNG_OK;
 
 	assert(session);
 	assert(consumer);
@@ -640,7 +640,7 @@ static int setup_relayd(struct ltt_session *session)
 			assert(socket->fd >= 0);
 
 			pthread_mutex_lock(socket->lock);
-			send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session,
+			ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session,
 					usess->consumer, socket->fd);
 			pthread_mutex_unlock(socket->lock);
 			if (ret != LTTNG_OK) {
@@ -657,7 +657,7 @@ static int setup_relayd(struct ltt_session *session)
 			assert(socket->fd >= 0);
 
 			pthread_mutex_lock(socket->lock);
-			send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session,
+			ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session,
 					ksess->consumer, socket->fd);
 			pthread_mutex_unlock(socket->lock);
 			if (ret != LTTNG_OK) {
@@ -2203,11 +2203,6 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 			break;
 		}
 
-		/* Append default kernel trace dir to subdir */
-		strncat(ksess->consumer->subdir, DEFAULT_KERNEL_TRACE_DIR,
-				sizeof(ksess->consumer->subdir) -
-				strlen(ksess->consumer->subdir) - 1);
-
 		/*
 		 * @session-lock
 		 * This is race free for now since the session lock is acquired before
@@ -2216,6 +2211,7 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		 * is valid.
 		 */
 		rcu_read_lock();
+		/* Destroy current consumer. We are about to replace it */
 		consumer_destroy_output(ksess->consumer);
 		rcu_read_unlock();
 		ksess->consumer = consumer;
@@ -2289,11 +2285,6 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 			break;
 		}
 
-		/* Append default kernel trace dir to subdir */
-		strncat(usess->consumer->subdir, DEFAULT_UST_TRACE_DIR,
-				sizeof(usess->consumer->subdir) -
-				strlen(usess->consumer->subdir) - 1);
-
 		/*
 		 * @session-lock
 		 * This is race free for now since the session lock is acquired before
@@ -2302,6 +2293,7 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		 * is valid.
 		 */
 		rcu_read_lock();
+		/* Destroy current consumer. We are about to replace it */
 		consumer_destroy_output(usess->consumer);
 		rcu_read_unlock();
 		usess->consumer = consumer;