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

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index 07898138a..fe9656a89 100644
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -74,6 +74,8 @@
 /* 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 {
@@ -4296,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.
  *
@@ -4422,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;