projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Pass session name to config_load_session when no path is provided
[lttng-tools.git]
/
src
/
common
/
config
/
config.c
diff --git
a/src/common/config/config.c
b/src/common/config/config.c
index 04bd2fdf207a71539e4e27a8b26f296b957a4c0b..7c6c49b6661a5b7353b0b2aecf67926938a5bdb6 100644
(file)
--- a/
src/common/config/config.c
+++ b/
src/common/config/config.c
@@
-31,7
+31,6
@@
#include <common/error.h>
#include <common/macros.h>
#include <common/utils.h>
#include <common/error.h>
#include <common/macros.h>
#include <common/utils.h>
-#include <common/config/config-session-internal.h>
#include <lttng/lttng-error.h>
#include <libxml/parser.h>
#include <libxml/valid.h>
#include <lttng/lttng-error.h>
#include <libxml/parser.h>
#include <libxml/valid.h>
@@
-1187,9
+1186,6
@@
int create_session(const char *name,
xmlNodePtr consumer_output_node;
assert(name);
xmlNodePtr consumer_output_node;
assert(name);
- assert(kernel_domain);
- assert(ust_domain);
- assert(jul_domain);
if (output_node) {
consumer_output_node = xmlFirstElementChild(output_node);
if (output_node) {
consumer_output_node = xmlFirstElementChild(output_node);
@@
-2460,7
+2456,7
@@
int config_load_session(const char *path, const char *session_name,
goto end;
}
goto end;
}
- ret = load_session_from_path(path,
NULL
,
+ ret = load_session_from_path(path,
session_name
,
&validation_ctx, 0);
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
free(path);
&validation_ctx, 0);
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
free(path);
@@
-2471,8
+2467,8
@@
int config_load_session(const char *path, const char *session_name,
}
/* Try system session configuration path */
}
/* Try system session configuration path */
- ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
NULL,
-
&validation_ctx, 0);
+ ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
+
session_name,
&validation_ctx, 0);
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
goto end;
}
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
goto end;
}
This page took
0.024521 seconds
and
4
git commands to generate.