X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.cpp;h=fe9656a89b8b59e1585f7693c3ca7db9cd3bf7ee;hb=d7bfb9b0fa35679d3e728b9165699d9faf905539;hp=aea78167160be7abc349758af1ad776d45b3c988;hpb=64803277bbdbe0a943360d918298a48157d9da55;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index aea781671..fe9656a89 100644
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -74,6 +74,11 @@
 /* Sleep for 100ms between each check for the shm path's deletion. */
 #define SESSION_DESTROY_SHM_PATH_CHECK_DELAY_US 100000
 
+namespace lsu = lttng::sessiond::ust;
+
+static enum lttng_error_code wait_on_path(void *path);
+
+namespace {
 struct cmd_destroy_session_reply_context {
 	int reply_sock_fd;
 	bool implicit_rotation_on_destroy;
@@ -84,15 +89,13 @@ struct cmd_destroy_session_reply_context {
 	enum lttng_error_code destruction_status;
 };
 
-static enum lttng_error_code wait_on_path(void *path);
-
 /*
  * Command completion handler that is used by the destroy command
  * when a session that has a non-default shm_path is being destroyed.
  *
  * See comment in cmd_destroy_session() for the rationale.
  */
-static struct destroy_completion_handler {
+struct destroy_completion_handler {
 	struct cmd_completion_handler handler;
 	char shm_path[member_sizeof(struct ltt_session, shm_path)];
 } destroy_completion_handler = {
@@ -103,17 +106,17 @@ static struct destroy_completion_handler {
 	.shm_path = { 0 },
 };
 
-static struct cmd_completion_handler *current_completion_handler;
-
 /*
  * Used to keep a unique index for each relayd socket created where this value
  * is associated with streams on the consumer so it can match the right relayd
  * to send to. It must be accessed with the relayd_net_seq_idx_lock
  * held.
  */
-static pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER;
-static uint64_t relayd_net_seq_idx;
+pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER;
+uint64_t relayd_net_seq_idx;
+} /* namespace */
 
+static struct cmd_completion_handler *current_completion_handler;
 static int validate_ust_event_name(const char *);
 static int cmd_enable_event_internal(struct ltt_session *session,
 		const struct lttng_domain *domain,
@@ -4295,102 +4298,6 @@ end:
 	return ret;
 }
 
-static
-int clear_metadata_file(int fd)
-{
-	int ret;
-	off_t lseek_ret;
-
-	lseek_ret = lseek(fd, 0, SEEK_SET);
-	if (lseek_ret < 0) {
-		PERROR("lseek");
-		ret = -1;
-		goto end;
-	}
-
-	ret = ftruncate(fd, 0);
-	if (ret < 0) {
-		PERROR("ftruncate");
-		goto end;
-	}
-
-end:
-	return ret;
-}
-
-static
-int ust_regenerate_metadata(struct ltt_ust_session *usess)
-{
-	int ret = 0;
-	struct buffer_reg_uid *uid_reg = NULL;
-	struct buffer_reg_session *session_reg = NULL;
-
-	rcu_read_lock();
-	cds_list_for_each_entry(uid_reg, &usess->buffer_reg_uid_list, lnode) {
-		struct ust_registry_session *registry;
-		struct ust_registry_channel *chan;
-		struct lttng_ht_iter iter_chan;
-
-		session_reg = uid_reg->registry;
-		registry = session_reg->reg.ust;
-
-		pthread_mutex_lock(&registry->lock);
-		registry->metadata_len_sent = 0;
-		memset(registry->metadata, 0, registry->metadata_alloc_len);
-		registry->metadata_len = 0;
-		registry->metadata_version++;
-		if (registry->metadata_fd > 0) {
-			/* Clear the metadata file's content. */
-			ret = clear_metadata_file(registry->metadata_fd);
-			if (ret) {
-				pthread_mutex_unlock(&registry->lock);
-				goto end;
-			}
-		}
-
-		ret = ust_metadata_session_statedump(registry, NULL,
-				registry->major, registry->minor);
-		if (ret) {
-			pthread_mutex_unlock(&registry->lock);
-			ERR("Failed to generate session metadata (err = %d)",
-					ret);
-			goto end;
-		}
-		cds_lfht_for_each_entry(registry->channels->ht, &iter_chan.iter,
-				chan, node.node) {
-			struct ust_registry_event *event;
-			struct lttng_ht_iter iter_event;
-
-			chan->metadata_dumped = 0;
-
-			ret = ust_metadata_channel_statedump(registry, chan);
-			if (ret) {
-				pthread_mutex_unlock(&registry->lock);
-				ERR("Failed to generate channel metadata "
-						"(err = %d)", ret);
-				goto end;
-			}
-			cds_lfht_for_each_entry(chan->events->ht, &iter_event.iter,
-						event, node.node) {
-				event->metadata_dumped = 0;
-				ret = ust_metadata_event_statedump(registry,
-						chan, event);
-				if (ret) {
-					pthread_mutex_unlock(&registry->lock);
-					ERR("Failed to generate event metadata "
-							"(err = %d)", ret);
-					goto end;
-				}
-			}
-		}
-		pthread_mutex_unlock(&registry->lock);
-	}
-
-end:
-	rcu_read_unlock();
-	return ret;
-}
-
 /*
  * Command LTTNG_REGENERATE_METADATA from the lttng-ctl library.
  *
@@ -4421,7 +4328,7 @@ int cmd_regenerate_metadata(struct ltt_session *session)
 	}
 
 	if (session->ust_session) {
-		ret = ust_regenerate_metadata(session->ust_session);
+		ret = trace_ust_regenerate_metadata(session->ust_session);
 		if (ret < 0) {
 			ERR("Failed to regenerate the UST metadata");
 			goto end;