projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change trace_path to session_root_path and chunk_path
[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 3625bba0f2d6d1f64049984f5209626d5d1dfcb1..114e9c21d7a10432613ea480aef7ba0bc6d2c3e4 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-94,6
+94,9
@@
static int lockfile_fd = -1;
/* Set to 1 when a SIGUSR1 signal is received. */
static int recv_child_signal;
/* Set to 1 when a SIGUSR1 signal is received. */
static int recv_child_signal;
+static struct lttng_kernel_tracer_version kernel_tracer_version;
+static struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
+
/*
* Consumer daemon specific control data. Every value not initialized here is
* set to 0 by the static definition.
/*
* Consumer daemon specific control data. Every value not initialized here is
* set to 0 by the static definition.
@@
-1270,6
+1273,7
@@
restart:
if (!cmd_socket_wrapper) {
goto error;
}
if (!cmd_socket_wrapper) {
goto error;
}
+ cmd_socket_wrapper->lock = &consumer_data->lock;
ret = consumer_send_channel_monitor_pipe(cmd_socket_wrapper,
consumer_data->channel_monitor_pipe);
ret = consumer_send_channel_monitor_pipe(cmd_socket_wrapper,
consumer_data->channel_monitor_pipe);
@@
-2620,7
+2624,8
@@
static int init_kernel_tracer(void)
}
/* Validate kernel version */
}
/* Validate kernel version */
- ret = kernel_validate_version(kernel_tracer_fd);
+ ret = kernel_validate_version(kernel_tracer_fd, &kernel_tracer_version,
+ &kernel_tracer_abi_version);
if (ret < 0) {
goto error_version;
}
if (ret < 0) {
goto error_version;
}
@@
-2829,9
+2834,9
@@
static int create_kernel_session(struct ltt_session *session)
/* Create directory(ies) on local filesystem. */
if (session->kernel_session->consumer->type == CONSUMER_DST_LOCAL &&
/* Create directory(ies) on local filesystem. */
if (session->kernel_session->consumer->type == CONSUMER_DST_LOCAL &&
- strlen(session->kernel_session->consumer->dst.
trace
_path) > 0) {
+ strlen(session->kernel_session->consumer->dst.
session_root
_path) > 0) {
ret = run_as_mkdir_recursive(
ret = run_as_mkdir_recursive(
- session->kernel_session->consumer->dst.
trace
_path,
+ session->kernel_session->consumer->dst.
session_root
_path,
S_IRWXU | S_IRWXG, session->uid, session->gid);
if (ret < 0) {
if (errno != EEXIST) {
S_IRWXU | S_IRWXG, session->uid, session->gid);
if (ret < 0) {
if (errno != EEXIST) {
This page took
0.024638 seconds
and
4
git commands to generate.