X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=1404e7f33f68d0e5ecec0f1d9544f330c7493526;hb=fb54cdbf2a8ff53e9dc11403a8aca643bbdde9c0;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..1404e7f33 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;
@@ -2327,10 +2319,10 @@ error:
 }
 
 /*
- * Command LTTNG_DATA_AVAILABLE returning 0 if the data is NOT ready to be read
- * or else 1 if the data is available for trace analysis.
+ * Command LTTNG_DATA_PENDING returning 0 if the data is NOT pending meaning
+ * ready for trace analysis (or anykind of reader) or else 1 for pending data.
  */
-int cmd_data_available(struct ltt_session *session)
+int cmd_data_pending(struct ltt_session *session)
 {
 	int ret;
 	struct ltt_kernel_session *ksess = session->kernel_session;
@@ -2345,23 +2337,23 @@ int cmd_data_available(struct ltt_session *session)
 	}
 
 	if (ksess && ksess->consumer) {
-		ret = consumer_is_data_available(ksess->id, ksess->consumer);
-		if (ret == 0) {
+		ret = consumer_is_data_pending(ksess->id, ksess->consumer);
+		if (ret == 1) {
 			/* Data is still being extracted for the kernel. */
 			goto error;
 		}
 	}
 
 	if (usess && usess->consumer) {
-		ret = consumer_is_data_available(usess->id, usess->consumer);
-		if (ret == 0) {
+		ret = consumer_is_data_pending(usess->id, usess->consumer);
+		if (ret == 1) {
 			/* Data is still being extracted for the kernel. */
 			goto error;
 		}
 	}
 
 	/* Data is ready to be read by a viewer */
-	ret = 1;
+	ret = 0;
 
 error:
 	return ret;