X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=e6b4250c11a255aaa600b353fb766e1b5ef54c35;hb=bd6e2c0bff23dd6d36afc3bccf1d4a0d38b74f40;hp=a76095eb5524a31814cd0231d791ddafcd4af05a;hpb=8a06890acaaa32494e47fb92e45ad40eca87af3f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index a76095eb5..e6b4250c1 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -5394,7 +5394,7 @@ static int reply_ust_register_channel(int sock, int sobjd, int cobjd,
 		size_t nr_fields, struct ustctl_field *fields)
 {
 	int ret, ret_code = 0;
-	uint32_t chan_id, reg_count;
+	uint32_t chan_id;
 	uint64_t chan_reg_key;
 	enum ustctl_channel_header type;
 	struct ust_app *app;
@@ -5446,13 +5446,12 @@ static int reply_ust_register_channel(int sock, int sobjd, int cobjd,
 	assert(chan_reg);
 
 	if (!chan_reg->register_done) {
-		reg_count = ust_registry_get_event_count(chan_reg);
-		if (reg_count < 31) {
-			type = USTCTL_CHANNEL_HEADER_COMPACT;
-		} else {
-			type = USTCTL_CHANNEL_HEADER_LARGE;
-		}
-
+		/*
+		 * TODO: eventually use the registry event count for
+		 * this channel to better guess header type for per-pid
+		 * buffers.
+		 */
+		type = USTCTL_CHANNEL_HEADER_LARGE;
 		chan_reg->nr_ctx_fields = nr_fields;
 		chan_reg->ctx_fields = fields;
 		fields = NULL;
@@ -5932,6 +5931,11 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 			struct buffer_reg_channel *reg_chan;
 			struct consumer_socket *socket;
 
+			if (!reg->registry->reg.ust->metadata_key) {
+				/* Skip since no metadata is present */
+				continue;
+			}
+
 			/* Get consumer socket to use to push the metadata.*/
 			socket = consumer_find_socket_by_bitness(reg->bits_per_long,
 					usess->consumer);