X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=11701aebfb9869b7e6dbac8deb26828bd3d8cebe;hb=fb3a43a9284f3300e9b66edc2f2c2d2767895423;hp=86e405158098d1bf9c995681985a5c6893ae86cf;hpb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 86e405158..11701aebf 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -171,6 +171,15 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
+		/*
+		 * The buffer flush is done on the session daemon side for the kernel
+		 * so no need for the stream "hangup_flush_done" variable to be
+		 * tracked. This is important for a kernel stream since we don't rely
+		 * on the flush state of the stream to read data. It's not the case for
+		 * user space tracing.
+		 */
+		new_stream->hangup_flush_done = 0;
+
 		/* The stream is not metadata. Get relayd reference if exists. */
 		relayd = consumer_find_relayd(msg.u.stream.net_index);
 		if (relayd != NULL) {
@@ -190,14 +199,29 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
-		if (ctx->on_recv_stream != NULL) {
-			ret = ctx->on_recv_stream(new_stream);
-			if (ret == 0) {
-				consumer_add_stream(new_stream);
-			} else if (ret < 0) {
-				goto end_nosignal;
+		/* Send stream to the metadata thread */
+		if (new_stream->metadata_flag) {
+			if (ctx->on_recv_stream) {
+				ret = ctx->on_recv_stream(new_stream);
+				if (ret < 0) {
+					goto end_nosignal;
+				}
+			}
+
+			do {
+				ret = write(ctx->consumer_metadata_pipe[1], new_stream,
+						sizeof(struct lttng_consumer_stream));
+			} while (ret < 0 && errno == EINTR);
+			if (ret < 0) {
+				PERROR("write metadata pipe");
 			}
 		} else {
+			if (ctx->on_recv_stream) {
+				ret = ctx->on_recv_stream(new_stream);
+				if (ret < 0) {
+					goto end_nosignal;
+				}
+			}
 			consumer_add_stream(new_stream);
 		}
 
@@ -257,7 +281,12 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	} while (ret < 0 && errno == EINTR);
 end_nosignal:
 	rcu_read_unlock();
-	return 0;
+
+	/*
+	 * Return 1 to indicate success since the 0 value can be a socket
+	 * shutdown during the recv() or send() call.
+	 */
+	return 1;
 }
 
 /*