projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename override to overwrite for config_load_session
[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 503f49fad8ce441586e4473c01ca6bd9de488c0e..d53ec0aa530ae88201932675c2bcb7e6b6dff719 100644
(file)
--- a/
src/common/config/session-config.c
+++ b/
src/common/config/session-config.c
@@
-2395,7
+2395,7
@@
end:
static
int process_session_node(xmlNodePtr session_node, const char *session_name,
static
int process_session_node(xmlNodePtr session_node, const char *session_name,
- int over
rid
e)
+ int over
writ
e)
{
int ret, started = -1, snapshot_mode = -1;
uint64_t live_timer_interval = UINT64_MAX;
{
int ret, started = -1, snapshot_mode = -1;
uint64_t live_timer_interval = UINT64_MAX;
@@
-2570,7
+2570,7
@@
domain_init_error:
goto error;
}
goto error;
}
- if (over
rid
e) {
+ if (over
writ
e) {
/* Destroy session if it exists */
ret = lttng_destroy_session((const char *) name);
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
/* Destroy session if it exists */
ret = lttng_destroy_session((const char *) name);
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
@@
-2665,7
+2665,7
@@
valid:
static
int load_session_from_file(const char *path, const char *session_name,
static
int load_session_from_file(const char *path, const char *session_name,
- struct session_config_validation_ctx *validation_ctx, int over
rid
e)
+ struct session_config_validation_ctx *validation_ctx, int over
writ
e)
{
int ret, session_found = !session_name;
xmlDocPtr doc = NULL;
{
int ret, session_found = !session_name;
xmlDocPtr doc = NULL;
@@
-2707,7
+2707,7
@@
int load_session_from_file(const char *path, const char *session_name,
session_node; session_node =
xmlNextElementSibling(session_node)) {
ret = process_session_node(session_node,
session_node; session_node =
xmlNextElementSibling(session_node)) {
ret = process_session_node(session_node,
- session_name, over
rid
e);
+ session_name, over
writ
e);
if (session_name && ret == 0) {
/* Target session found and loaded */
session_found = 1;
if (session_name && ret == 0) {
/* Target session found and loaded */
session_found = 1;
@@
-2741,7
+2741,7
@@
struct dirent *alloc_dirent(const char *path)
static
int load_session_from_path(const char *path, const char *session_name,
static
int load_session_from_path(const char *path, const char *session_name,
- struct session_config_validation_ctx *validation_ctx, int over
rid
e)
+ struct session_config_validation_ctx *validation_ctx, int over
writ
e)
{
int ret, session_found = !session_name;
DIR *directory = NULL;
{
int ret, session_found = !session_name;
DIR *directory = NULL;
@@
-2816,7
+2816,7
@@
int load_session_from_path(const char *path, const char *session_name,
file_path[path_len + file_name_len] = '\0';
ret = load_session_from_file(file_path, session_name,
file_path[path_len + file_name_len] = '\0';
ret = load_session_from_file(file_path, session_name,
- validation_ctx, over
rid
e);
+ validation_ctx, over
writ
e);
if (session_name && !ret) {
session_found = 1;
break;
if (session_name && !ret) {
session_found = 1;
break;
@@
-2827,7
+2827,7
@@
int load_session_from_path(const char *path, const char *session_name,
free(file_path);
} else {
ret = load_session_from_file(path, session_name,
free(file_path);
} else {
ret = load_session_from_file(path, session_name,
- validation_ctx, over
rid
e);
+ validation_ctx, over
writ
e);
if (ret) {
goto end;
} else {
if (ret) {
goto end;
} else {
@@
-2885,7
+2885,7
@@
invalid:
LTTNG_HIDDEN
int config_load_session(const char *path, const char *session_name,
LTTNG_HIDDEN
int config_load_session(const char *path, const char *session_name,
- int over
rid
e, unsigned int autoload)
+ int over
writ
e, unsigned int autoload)
{
int ret;
bool session_loaded = false;
{
int ret;
bool session_loaded = false;
@@
-2939,7
+2939,7
@@
int config_load_session(const char *path, const char *session_name,
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
- &validation_ctx, over
rid
e);
+ &validation_ctx, over
writ
e);
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
goto end;
}
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
goto end;
}
@@
-2969,7
+2969,7
@@
int config_load_session(const char *path, const char *session_name,
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
- &validation_ctx, over
rid
e);
+ &validation_ctx, over
writ
e);
if (!ret) {
session_loaded = true;
}
if (!ret) {
session_loaded = true;
}
@@
-2994,7
+2994,7
@@
int config_load_session(const char *path, const char *session_name,
}
ret = load_session_from_path(path, session_name,
}
ret = load_session_from_path(path, session_name,
- &validation_ctx, over
rid
e);
+ &validation_ctx, over
writ
e);
}
end:
fini_session_config_validation_ctx(&validation_ctx);
}
end:
fini_session_config_validation_ctx(&validation_ctx);
This page took
0.033601 seconds
and
4
git commands to generate.