projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generate session name and default output on sessiond's end
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel-consumer.c
diff --git
a/src/bin/lttng-sessiond/kernel-consumer.c
b/src/bin/lttng-sessiond/kernel-consumer.c
index 1368dc16385ce81aa6737dbf95d3e8ace00097f1..993e7b95cf21da8ff2f151f4412b3079f3746b40 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-48,7
+48,7
@@
static char *create_channel_path(struct consumer_output *consumer,
ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s%s",
consumer->dst.session_root_path,
consumer->chunk_path,
ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s%s",
consumer->dst.session_root_path,
consumer->chunk_path,
- consumer->subdir);
+ consumer->
domain_
subdir);
if (ret < 0) {
PERROR("snprintf kernel channel path");
goto error;
if (ret < 0) {
PERROR("snprintf kernel channel path");
goto error;
@@
-57,7
+57,7
@@
static char *create_channel_path(struct consumer_output *consumer,
sizeof(tmp_path), ret,
consumer->dst.session_root_path,
consumer->chunk_path,
sizeof(tmp_path), ret,
consumer->dst.session_root_path,
consumer->chunk_path,
- consumer->subdir);
+ consumer->
domain_
subdir);
goto error;
}
pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
goto error;
}
pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
@@
-76,9
+76,10
@@
static char *create_channel_path(struct consumer_output *consumer,
}
DBG3("Kernel local consumer tracefile path: %s", pathname);
} else {
}
DBG3("Kernel local consumer tracefile path: %s", pathname);
} else {
+ /* Network output. */
ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
consumer->dst.net.base_dir,
ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
consumer->dst.net.base_dir,
- consumer->subdir);
+ consumer->
domain_
subdir);
if (ret < 0) {
PERROR("snprintf kernel metadata path");
goto error;
if (ret < 0) {
PERROR("snprintf kernel metadata path");
goto error;
@@
-86,7
+87,7
@@
static char *create_channel_path(struct consumer_output *consumer,
ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
sizeof(tmp_path), ret,
consumer->dst.net.base_dir,
ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
sizeof(tmp_path), ret,
consumer->dst.net.base_dir,
- consumer->subdir);
+ consumer->
domain_
subdir);
goto error;
}
pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
goto error;
}
pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
This page took
0.024065 seconds
and
4
git commands to generate.