projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: loading of live session within userspace domains
[lttng-tools.git]
/
src
/
common
/
config
/
session-config.c
diff --git
a/src/common/config/session-config.c
b/src/common/config/session-config.c
index eea6c0a81d5062e7db0047252f4309d5c3ec7c5c..48094c59a427f9636e5b222c09bd85c6b5c3a0d9 100644
(file)
--- a/
src/common/config/session-config.c
+++ b/
src/common/config/session-config.c
@@
-1151,17
+1151,16
@@
end:
}
static
}
static
-int create_session_net_output(const char *name,
struct lttng_domain *domain
,
-
const char *control_uri,
const char *data_uri)
+int create_session_net_output(const char *name,
const char *control_uri
,
+
const char *data_uri)
{
int ret;
struct lttng_handle *handle;
const char *uri = NULL;
assert(name);
{
int ret;
struct lttng_handle *handle;
const char *uri = NULL;
assert(name);
- assert(domain);
- handle = lttng_create_handle(name,
domain
);
+ handle = lttng_create_handle(name,
NULL
);
if (!handle) {
ret = -LTTNG_ERR_NOMEM;
goto end;
if (!handle) {
ret = -LTTNG_ERR_NOMEM;
goto end;
@@
-1343,11
+1342,6
@@
int create_session(const char *name,
}
if (output.control_uri || output.data_uri) {
}
if (output.control_uri || output.data_uri) {
- int i;
- struct lttng_domain *domain;
- struct lttng_domain *domains[] =
- { kernel_domain, ust_domain, jul_domain, log4j_domain };
-
/* network destination */
if (live_timer_interval && live_timer_interval != UINT64_MAX) {
/*
/* network destination */
if (live_timer_interval && live_timer_interval != UINT64_MAX) {
/*
@@
-1363,18
+1357,12
@@
int create_session(const char *name,
goto end;
}
goto end;
}
- for (i = 0; i < (sizeof(domains) / sizeof(domains[0])); i++) {
- domain = domains[i];
- if (!domain) {
- continue;
- }
-
- ret = create_session_net_output(name, domain, output.control_uri,
- output.data_uri);
- if (ret) {
- goto end;
- }
+ ret = create_session_net_output(name, output.control_uri,
+ output.data_uri);
+ if (ret) {
+ goto end;
}
}
+
} else {
/* either local output or no output */
ret = lttng_create_session(name, output.path);
} else {
/* either local output or no output */
ret = lttng_create_session(name, output.path);
This page took
0.024808 seconds
and
4
git commands to generate.