X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=21b4cf326bd49e48f0f2a1b2caeee34554578981;hp=e68aa79d4c053ecd5aa598a7f10d7cee4ac383e4;hb=ccf10263bcd2ca4667b9e1fc4dab64a3c8d8c4d8;hpb=e8fa9fb0539ec3d734f6d0ab91220b4538b2ea30

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index e68aa79d4..21b4cf326 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2765,7 +2765,16 @@ static int create_ust_session(struct ltt_session *session,
 	lus->snapshot_mode = session->snapshot_mode;
 	lus->live_timer_interval = session->live_timer;
 	session->ust_session = lus;
-
+	if (session->shm_path[0]) {
+		strncpy(lus->root_shm_path, session->shm_path,
+			sizeof(lus->root_shm_path));
+		lus->root_shm_path[sizeof(lus->root_shm_path) - 1] = '\0';
+		strncpy(lus->shm_path, session->shm_path,
+			sizeof(lus->shm_path));
+		lus->shm_path[sizeof(lus->shm_path) - 1] = '\0';
+		strncat(lus->shm_path, "/ust",
+			sizeof(lus->shm_path) - strlen(lus->shm_path) - 1);
+	}
 	/* Copy session output to the newly created UST session */
 	ret = copy_session_consumer(domain->type, session);
 	if (ret != LTTNG_OK) {
@@ -2890,6 +2899,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_SNAPSHOT_LIST_OUTPUT:
 	case LTTNG_SNAPSHOT_RECORD:
 	case LTTNG_SAVE_SESSION:
+	case LTTNG_SET_SESSION_SHM_PATH:
 		need_domain = 0;
 		break;
 	default:
@@ -3242,6 +3252,20 @@ skip_domain:
 				&cmd_ctx->lsm->u.channel.chan, kernel_poll_pipe[1]);
 		break;
 	}
+	case LTTNG_TRACK_PID:
+	{
+		ret = cmd_track_pid(cmd_ctx->session,
+				cmd_ctx->lsm->domain.type,
+				cmd_ctx->lsm->u.pid_tracker.pid);
+		break;
+	}
+	case LTTNG_UNTRACK_PID:
+	{
+		ret = cmd_untrack_pid(cmd_ctx->session,
+				cmd_ctx->lsm->domain.type,
+				cmd_ctx->lsm->u.pid_tracker.pid);
+		break;
+	}
 	case LTTNG_ENABLE_EVENT:
 	{
 		struct lttng_event_exclusion *exclusion = NULL;
@@ -3830,6 +3854,12 @@ skip_domain:
 			&cmd_ctx->creds);
 		break;
 	}
+	case LTTNG_SET_SESSION_SHM_PATH:
+	{
+		ret = cmd_set_session_shm_path(cmd_ctx->session,
+				cmd_ctx->lsm->u.set_shm_path.shm_path);
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;
@@ -4596,6 +4626,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 		} else {
 			unsigned long v;
 
+			if (!arg) {
+				ret = -EINVAL;
+				goto end;
+			}
 			errno = 0;
 			v = strtoul(arg, NULL, 0);
 			if (errno != 0 || !isdigit(arg[0])) {