X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=a133eeeef19fe563f06af0b89b52033c60fef60d;hp=5cf90493947f4de46d9a4738e6cf640ba98fedcf;hb=294e218e892904111d59699d074681c012a2599c;hpb=a0fda194a7bc479b43f1f76a0cbf3f0796e5b49a

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 5cf904939..a133eeeef 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -5429,7 +5429,7 @@ static int reply_ust_register_channel(int sock, 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;
@@ -5481,13 +5481,12 @@ static int reply_ust_register_channel(int sock, 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;
@@ -5975,6 +5974,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);
@@ -6323,7 +6327,7 @@ int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
  *
  * Return 0 on success or else a negative value.
  */
-int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
+int ust_app_rotate_session(struct ltt_session *session)
 {
 	int ret = 0;
 	struct lttng_ht_iter iter;
@@ -6352,22 +6356,6 @@ int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
 				goto error;
 			}
 
-			/*
-			 * Account the metadata channel first to make sure the
-			 * number of channels waiting for a rotation cannot
-			 * reach 0 before we complete the iteration over all
-			 * the channels.
-			 */
-			ret = rotate_add_channel_pending(
-					reg->registry->reg.ust->metadata_key,
-					LTTNG_DOMAIN_UST, session);
-			if (ret < 0) {
-				ret = reg->bits_per_long == 32 ?
-						-LTTNG_ERR_UST_CONSUMER32_FAIL :
-						-LTTNG_ERR_UST_CONSUMER64_FAIL;
-				goto error;
-			}
-
 			ret = snprintf(pathname, sizeof(pathname),
 					DEFAULT_UST_TRACE_DIR "/" DEFAULT_UST_TRACE_UID_PATH,
 					reg->uid, reg->bits_per_long);
@@ -6379,22 +6367,12 @@ int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
 			/* Rotate the data channels. */
 			cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
 					reg_chan, node.node) {
-				ret = rotate_add_channel_pending(
-						reg_chan->consumer_key,
-						LTTNG_DOMAIN_UST, session);
-				if (ret < 0) {
-					ret = reg->bits_per_long == 32 ?
-							-LTTNG_ERR_UST_CONSUMER32_FAIL :
-							-LTTNG_ERR_UST_CONSUMER64_FAIL;
-					goto error;
-				}
 				ret = consumer_rotate_channel(socket,
 						reg_chan->consumer_key,
 						usess->uid, usess->gid,
 						usess->consumer, pathname,
 						/* is_metadata_channel */ false,
-						session->current_archive_id,
-						&session->rotate_pending_relay);
+						session->current_archive_id);
 				if (ret < 0) {
 					goto error;
 				}
@@ -6407,12 +6385,10 @@ int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
 					usess->uid, usess->gid,
 					usess->consumer, pathname,
 					/* is_metadata_channel */ true,
-					session->current_archive_id,
-					&session->rotate_pending_relay);
+					session->current_archive_id);
 			if (ret < 0) {
 				goto error;
 			}
-			*ust_active = true;
 		}
 		break;
 	}
@@ -6453,39 +6429,15 @@ int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
 				goto error;
 			}
 
-			/*
-			 * Account the metadata channel first to make sure the
-			 * number of channels waiting for a rotation cannot
-			 * reach 0 before we complete the iteration over all
-			 * the channels.
-			 */
-			ret = rotate_add_channel_pending(registry->metadata_key,
-					LTTNG_DOMAIN_UST, session);
-			if (ret < 0) {
-				ret = app->bits_per_long == 32 ?
-						-LTTNG_ERR_UST_CONSUMER32_FAIL :
-						-LTTNG_ERR_UST_CONSUMER64_FAIL;
-				goto error;
-			}
 
 			/* Rotate the data channels. */
 			cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
 					ua_chan, node.node) {
-				ret = rotate_add_channel_pending(
-						ua_chan->key, LTTNG_DOMAIN_UST,
-						session);
-				if (ret < 0) {
-					ret = app->bits_per_long == 32 ?
-							-LTTNG_ERR_UST_CONSUMER32_FAIL :
-							-LTTNG_ERR_UST_CONSUMER64_FAIL;
-					goto error;
-				}
 				ret = consumer_rotate_channel(socket, ua_chan->key,
 						ua_sess->euid, ua_sess->egid,
 						ua_sess->consumer, pathname,
 						/* is_metadata_channel */ false,
-						session->current_archive_id,
-						&session->rotate_pending_relay);
+						session->current_archive_id);
 				if (ret < 0) {
 					goto error;
 				}
@@ -6497,12 +6449,10 @@ int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
 					ua_sess->euid, ua_sess->egid,
 					ua_sess->consumer, pathname,
 					/* is_metadata_channel */ true,
-					session->current_archive_id,
-					&session->rotate_pending_relay);
+					session->current_archive_id);
 			if (ret < 0) {
 				goto error;
 			}
-			*ust_active = true;
 		}
 		break;
 	}