X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=480971b8982287e980ca09836d72b2105b869b23;hp=2366fd320f46046f1db7b45d8013c23f9460794d;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hpb=dc2bbdaea73908117fdccc5e8247b613bd3b8600

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 2366fd320..480971b89 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -581,7 +581,6 @@ static int push_metadata(struct ust_registry_session *registry,
 	return 0;
 
 error:
-end:
 	pthread_mutex_unlock(&registry->lock);
 	return ret_val;
 }
@@ -1594,6 +1593,7 @@ static void shadow_copy_session(struct ust_app_session *ua_sess,
 	struct tm *timeinfo;
 	char datetime[16];
 	int ret;
+	char tmp_shm_path[PATH_MAX];
 
 	/* Get date and time for unique app path */
 	time(&rawtime);
@@ -1637,6 +1637,35 @@ static void shadow_copy_session(struct ust_app_session *ua_sess,
 		goto error;
 	}
 
+	strncpy(ua_sess->shm_path, usess->shm_path,
+		sizeof(ua_sess->shm_path));
+	ua_sess->shm_path[sizeof(ua_sess->shm_path) - 1] = '\0';
+	if (ua_sess->shm_path[0]) {
+		switch (ua_sess->buffer_type) {
+		case LTTNG_BUFFER_PER_PID:
+			ret = snprintf(tmp_shm_path, sizeof(tmp_shm_path),
+					DEFAULT_UST_TRACE_PID_PATH "/%s-%d-%s",
+					app->name, app->pid, datetime);
+			break;
+		case LTTNG_BUFFER_PER_UID:
+			ret = snprintf(tmp_shm_path, sizeof(tmp_shm_path),
+					DEFAULT_UST_TRACE_UID_PATH,
+					app->uid, app->bits_per_long);
+			break;
+		default:
+			assert(0);
+			goto error;
+		}
+		if (ret < 0) {
+			PERROR("sprintf UST shadow copy session");
+			assert(0);
+			goto error;
+		}
+		strncat(ua_sess->shm_path, tmp_shm_path,
+			sizeof(ua_sess->shm_path) - strlen(ua_sess->shm_path) - 1);
+		ua_sess->shm_path[sizeof(ua_sess->shm_path) - 1] = '\0';
+	}
+
 	/* Iterate over all channels in global domain. */
 	cds_lfht_for_each_entry(usess->domain_global.channels->ht, &iter.iter,
 			uchan, node.node) {
@@ -1728,7 +1757,8 @@ static int setup_buffer_reg_pid(struct ust_app_session *ua_sess,
 		 * This is the create channel path meaning that if there is NO
 		 * registry available, we have to create one for this session.
 		 */
-		ret = buffer_reg_pid_create(ua_sess->id, &reg_pid);
+		ret = buffer_reg_pid_create(ua_sess->id, &reg_pid,
+			ua_sess->shm_path);
 		if (ret < 0) {
 			goto error;
 		}
@@ -1742,7 +1772,8 @@ static int setup_buffer_reg_pid(struct ust_app_session *ua_sess,
 			app->uint16_t_alignment, app->uint32_t_alignment,
 			app->uint64_t_alignment, app->long_alignment,
 			app->byte_order, app->version.major,
-			app->version.minor);
+			app->version.minor, reg_pid->shm_path,
+			ua_sess->euid, ua_sess->egid);
 	if (ret < 0) {
 		/*
 		 * reg_pid->registry->reg.ust is NULL upon error, so we need to
@@ -1775,6 +1806,7 @@ error:
  * Return 0 on success or else a negative value.
  */
 static int setup_buffer_reg_uid(struct ltt_ust_session *usess,
+		struct ust_app_session *ua_sess,
 		struct ust_app *app, struct buffer_reg_uid **regp)
 {
 	int ret = 0;
@@ -1792,7 +1824,7 @@ static int setup_buffer_reg_uid(struct ltt_ust_session *usess,
 		 * registry available, we have to create one for this session.
 		 */
 		ret = buffer_reg_uid_create(usess->id, app->bits_per_long, app->uid,
-				LTTNG_DOMAIN_UST, &reg_uid);
+				LTTNG_DOMAIN_UST, &reg_uid, ua_sess->shm_path);
 		if (ret < 0) {
 			goto error;
 		}
@@ -1806,7 +1838,8 @@ static int setup_buffer_reg_uid(struct ltt_ust_session *usess,
 			app->uint16_t_alignment, app->uint32_t_alignment,
 			app->uint64_t_alignment, app->long_alignment,
 			app->byte_order, app->version.major,
-			app->version.minor);
+			app->version.minor, reg_uid->shm_path,
+			usess->uid, usess->gid);
 	if (ret < 0) {
 		/*
 		 * reg_uid->registry->reg.ust is NULL upon error, so we need to
@@ -1881,7 +1914,7 @@ static int create_ust_app_session(struct ltt_ust_session *usess,
 		break;
 	case LTTNG_BUFFER_PER_UID:
 		/* Look for a global registry. If none exists, create one. */
-		ret = setup_buffer_reg_uid(usess, app, NULL);
+		ret = setup_buffer_reg_uid(usess, ua_sess, app, NULL);
 		if (ret < 0) {
 			delete_ust_app_session(-1, ua_sess, app);
 			goto error;
@@ -4186,7 +4219,6 @@ int ust_app_flush_session(struct ltt_ust_session *usess)
 		break;
 	}
 
-end_no_session:
 	rcu_read_unlock();
 	health_code_update();
 	return ret;