X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=9bd622d87e80df2d50165ae00c5a54c2b8b70d4e;hb=dec56f6cc894de41b312354d360b6a4c09fc199d;hp=4c9d227af008a285bd17d8732ed906803351f275;hpb=1624d5b7ba86633d36f3a5c86ea1df5d308c4360;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 4c9d227af..9bd622d87 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1381,7 +1381,7 @@ static void shadow_copy_session(struct ust_app_session *ua_sess,
 	switch (ua_sess->buffer_type) {
 	case LTTNG_BUFFER_PER_PID:
 		ret = snprintf(ua_sess->path, sizeof(ua_sess->path),
-				DEFAULT_UST_TRACE_PID_PATH "/%s-%d-%s/", app->name, app->pid,
+				DEFAULT_UST_TRACE_PID_PATH "/%s-%d-%s", app->name, app->pid,
 				datetime);
 		break;
 	case LTTNG_BUFFER_PER_UID:
@@ -1502,7 +1502,9 @@ static int setup_buffer_reg_pid(struct ust_app_session *ua_sess,
 	ret = ust_registry_session_init(&reg_pid->registry->reg.ust, app,
 			app->bits_per_long, app->uint8_t_alignment,
 			app->uint16_t_alignment, app->uint32_t_alignment,
-			app->uint64_t_alignment, app->long_alignment, app->byte_order);
+			app->uint64_t_alignment, app->long_alignment,
+			app->byte_order, app->version.major,
+			app->version.minor);
 	if (ret < 0) {
 		goto error;
 	}
@@ -1553,10 +1555,12 @@ static int setup_buffer_reg_uid(struct ltt_ust_session *usess,
 	}
 
 	/* Initialize registry. */
-	ret = ust_registry_session_init(&reg_uid->registry->reg.ust, app,
+	ret = ust_registry_session_init(&reg_uid->registry->reg.ust, NULL,
 			app->bits_per_long, app->uint8_t_alignment,
 			app->uint16_t_alignment, app->uint32_t_alignment,
-			app->uint64_t_alignment, app->long_alignment, app->byte_order);
+			app->uint64_t_alignment, app->long_alignment,
+			app->byte_order, app->version.major,
+			app->version.minor);
 	if (ret < 0) {
 		goto error;
 	}