projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Channel creation error return code was not set
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-ust.c
diff --git
a/src/bin/lttng-sessiond/trace-ust.c
b/src/bin/lttng-sessiond/trace-ust.c
index 3e382b7a5fb738eb11f7fb5041bce65657067249..864a4b0d1bb0dcd25c2e2de54b16999f8d3d22cc 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.c
+++ b/
src/bin/lttng-sessiond/trace-ust.c
@@
-111,7
+111,7
@@
struct ltt_ust_session *trace_ust_create_session(char *path,
lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
- goto error_
free_session
;
+ goto error_
consumer
;
}
/*
}
/*
@@
-128,7
+128,7
@@
struct ltt_ust_session *trace_ust_create_session(char *path,
"%s" DEFAULT_UST_TRACE_DIR, path);
if (ret < 0) {
PERROR("snprintf UST consumer trace path");
"%s" DEFAULT_UST_TRACE_DIR, path);
if (ret < 0) {
PERROR("snprintf UST consumer trace path");
- goto error;
+ goto error
_path
;
}
/* Set session path */
}
/* Set session path */
@@
-136,7
+136,7
@@
struct ltt_ust_session *trace_ust_create_session(char *path,
path);
if (ret < 0) {
PERROR("snprintf kernel traces path");
path);
if (ret < 0) {
PERROR("snprintf kernel traces path");
- goto error_
free_session
;
+ goto error_
path
;
}
}
}
}
@@
-144,7
+144,9
@@
struct ltt_ust_session *trace_ust_create_session(char *path,
return lus;
return lus;
-error_free_session:
+error_path:
+ consumer_destroy_output(lus->consumer);
+error_consumer:
lttng_ht_destroy(lus->domain_global.channels);
lttng_ht_destroy(lus->domain_exec);
lttng_ht_destroy(lus->domain_pid);
lttng_ht_destroy(lus->domain_global.channels);
lttng_ht_destroy(lus->domain_exec);
lttng_ht_destroy(lus->domain_pid);
This page took
0.024151 seconds
and
4
git commands to generate.