lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
- goto error_free_session;
+ goto error_consumer;
}
/*
"%s" DEFAULT_UST_TRACE_DIR, path);
if (ret < 0) {
PERROR("snprintf UST consumer trace path");
- goto error;
+ goto error_path;
}
/* Set session path */
path);
if (ret < 0) {
PERROR("snprintf kernel traces path");
- goto error_free_session;
+ goto error_path;
}
}
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);
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);
- /* Alloc context hash tables */
- lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
- if (lue->ctx == NULL) {
- ERR("Unable to create context hash table for event %s", ev->name);
- goto error_free_event;
- }
DBG2("Trace UST event %s, loglevel (%d,%d) created",
lue->attr.name, lue->attr.loglevel_type,
/* Set default attributes */
lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
- lum->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+ lum->attr.subbuf_size = default_get_metadata_subbuf_size();
lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
lum->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
lum->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
void trace_ust_destroy_event(struct ltt_ust_event *event)
{
DBG2("Trace destroy UST event %s", event->attr.name);
- destroy_contexts(event->ctx);
free(event->filter);
free(event);
}
destroy_domain_pid(session->domain_pid);
destroy_domain_exec(session->domain_exec);
+ consumer_destroy_output(session->consumer);
+ consumer_destroy_output(session->tmp_consumer);
+
free(session);
rcu_read_unlock();