projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement --shm-path option for UST sessions (per-uid channels)
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index e68aa79d4c053ecd5aa598a7f10d7cee4ac383e4..c542179371327b951d71255902b949c789f265fd 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-2765,7
+2765,13
@@
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;
lus->snapshot_mode = session->snapshot_mode;
lus->live_timer_interval = session->live_timer;
session->ust_session = lus;
-
+ if (session->shm_path[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) {
/* Copy session output to the newly created UST session */
ret = copy_session_consumer(domain->type, session);
if (ret != LTTNG_OK) {
@@
-2890,6
+2896,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_SNAPSHOT_LIST_OUTPUT:
case LTTNG_SNAPSHOT_RECORD:
case LTTNG_SAVE_SESSION:
+ case LTTNG_SET_SESSION_SHM_PATH:
need_domain = 0;
break;
default:
need_domain = 0;
break;
default:
@@
-3830,6
+3837,12
@@
skip_domain:
&cmd_ctx->creds);
break;
}
&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;
default:
ret = LTTNG_ERR_UND;
break;
This page took
0.025817 seconds
and
4
git commands to generate.