projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: bad copy paste in enable-channel command
[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 8363ae2954912482900e2aa5f3eeeeb4cd7bd26f..b64597599caaaa9e127306f0c1b0bee806c508f0 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.c
+++ b/
src/bin/lttng-sessiond/trace-ust.c
@@
-191,6
+191,7
@@
error:
*/
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
{
*/
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
{
+ int ret;
struct ltt_ust_session *lus;
/* Allocate a new ltt ust session */
struct ltt_ust_session *lus;
/* Allocate a new ltt ust session */
@@
-218,6
+219,10
@@
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
/* Alloc UST global domain channels' HT */
lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
/* Alloc UST global domain channels' HT */
lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+ ret = jul_init_domain(&lus->domain_jul);
+ if (ret < 0) {
+ goto error_consumer;
+ }
lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
@@
-238,6
+243,7
@@
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
error_consumer:
ht_cleanup_push(lus->domain_global.channels);
error_consumer:
ht_cleanup_push(lus->domain_global.channels);
+ jul_destroy_domain(&lus->domain_jul);
free(lus);
error:
return NULL;
free(lus);
error:
return NULL;
@@
-677,6
+683,7
@@
void trace_ust_destroy_session(struct ltt_ust_session *session)
/* Cleaning up UST domain */
destroy_domain_global(&session->domain_global);
/* Cleaning up UST domain */
destroy_domain_global(&session->domain_global);
+ jul_destroy_domain(&session->domain_jul);
/* Cleanup UID buffer registry object(s). */
cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,
/* Cleanup UID buffer registry object(s). */
cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,
This page took
0.027607 seconds
and
4
git commands to generate.