#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>
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 (session_name && strcmp(name, session_name)) {
/* This is not the session we are looking for */
- ret = -LTTNG_ERR_LOAD_SESSION_NOT_FOUND;
+ ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
goto end;
}
end:
xmlFreeDoc(doc);
if (!ret) {
- ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOT_FOUND;
+ ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOENT;
}
return ret;
}
}
if (!session_found) {
- ret = -LTTNG_ERR_LOAD_SESSION_NOT_FOUND;
+ ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
}
return ret;
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);
}
/* 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;
}