X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=b9d843714550c5821d3b091eb7fb6e390a3c6786;hp=dd5cf1761a4992c9e7384d48675038c5438ece0e;hb=ff588497b3dfc3138c9ce005e9270ed5568c05df;hpb=f5ba75b4f0c0b44092c76bc931b25b24a2e62718

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index dd5cf1761..b9d843714 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1207,8 +1207,8 @@ error_rotate_channel:
 	case LTTNG_CONSUMER_CREATE_TRACE_CHUNK:
 	{
 		const struct lttng_credentials credentials = {
-			.uid = msg.u.create_trace_chunk.credentials.value.uid,
-			.gid = msg.u.create_trace_chunk.credentials.value.gid,
+			.uid = LTTNG_OPTIONAL_INIT_VALUE(msg.u.create_trace_chunk.credentials.value.uid),
+			.gid = LTTNG_OPTIONAL_INIT_VALUE(msg.u.create_trace_chunk.credentials.value.gid),
 		};
 		const bool is_local_trace =
 				!msg.u.create_trace_chunk.relayd_id.is_set;
@@ -1311,6 +1311,24 @@ error_rotate_channel:
 				msg.u.trace_chunk_exists.chunk_id);
 		goto end_msg_sessiond;
 	}
+	case LTTNG_CONSUMER_OPEN_CHANNEL_PACKETS:
+	{
+		const uint64_t key = msg.u.open_channel_packets.key;
+		struct lttng_consumer_channel *channel =
+				consumer_find_channel(key);
+
+		if (channel) {
+			pthread_mutex_lock(&channel->lock);
+			ret_code = lttng_consumer_open_channel_packets(channel);
+			pthread_mutex_unlock(&channel->lock);
+		} else {
+			WARN("Channel %" PRIu64 " not found", key);
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		}
+
+		health_code_update();
+		goto end_msg_sessiond;
+	}
 	default:
 		goto end_nosignal;
 	}
@@ -1348,36 +1366,38 @@ end:
  * metadata thread can consumer them.
  *
  * Metadata stream lock MUST be acquired.
- *
- * Return 0 if new metadatda is available, EAGAIN if the metadata stream
- * is empty or a negative value on error.
  */
-int lttng_kconsumer_sync_metadata(struct lttng_consumer_stream *metadata)
+enum sync_metadata_status lttng_kconsumer_sync_metadata(
+		struct lttng_consumer_stream *metadata)
 {
 	int ret;
+	enum sync_metadata_status status;
 
 	assert(metadata);
 
 	ret = kernctl_buffer_flush(metadata->wait_fd);
 	if (ret < 0) {
 		ERR("Failed to flush kernel stream");
+		status = SYNC_METADATA_STATUS_ERROR;
 		goto end;
 	}
 
 	ret = kernctl_snapshot(metadata->wait_fd);
 	if (ret < 0) {
-		if (ret != -EAGAIN) {
+		if (errno == EAGAIN) {
+			/* No new metadata, exit. */
+			DBG("Sync metadata, no new kernel metadata");
+			status = SYNC_METADATA_STATUS_NO_DATA;
+		} else {
 			ERR("Sync metadata, taking kernel snapshot failed.");
-			goto end;
+			status = SYNC_METADATA_STATUS_ERROR;
 		}
-		DBG("Sync metadata, no new kernel metadata");
-		/* No new metadata, exit. */
-		ret = ENODATA;
-		goto end;
+	} else {
+		status = SYNC_METADATA_STATUS_NEW_DATA;
 	}
 
 end:
-	return ret;
+	return status;
 }
 
 static