lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
- goto error;
+ goto error_consumer;
}
/*
lus->tmp_consumer = NULL;
/* Use the default consumer output which is the tracing session path. */
- ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX, "%s/ust", path);
- if (ret < 0) {
- PERROR("snprintf UST consumer trace path");
- goto error;
- }
+ if (path && strlen(path) > 0) {
+ ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
+ "%s" DEFAULT_UST_TRACE_DIR, path);
+ if (ret < 0) {
+ PERROR("snprintf UST consumer trace path");
+ goto error_path;
+ }
- /* Set session path */
- ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
- if (ret < 0) {
- PERROR("snprintf kernel traces path");
- goto error_free_session;
+ /* Set session path */
+ ret = snprintf(lus->pathname, PATH_MAX, "%s" DEFAULT_UST_TRACE_DIR,
+ path);
+ if (ret < 0) {
+ PERROR("snprintf kernel traces path");
+ goto error_path;
+ }
}
DBG2("UST trace session create successful");
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);
/* 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;
{
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();