*
* Return pointer to structure or NULL.
*/
-struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
- struct lttng_domain *domain)
+struct ltt_ust_session *trace_ust_create_session(char *path,
+ unsigned int session_id, struct lttng_domain *domain)
{
int ret;
struct ltt_ust_session *lus;
/* Alloc UST global domain channels' HT */
lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+ lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+ if (lus->consumer == NULL) {
+ goto error;
+ }
+
+ /*
+ * The tmp_consumer stays NULL until a set_consumer_uri command is
+ * executed. At this point, the consumer should be nullify until an
+ * enable_consumer command. This assignment is symbolic since we've zmalloc
+ * the struct.
+ */
+ 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;
+ }
+
/* Set session path */
ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
if (ret < 0) {
return lus;
error_free_session:
+ lttng_ht_destroy(lus->domain_global.channels);
+ lttng_ht_destroy(lus->domain_exec);
+ lttng_ht_destroy(lus->domain_pid);
free(lus);
error:
return NULL;
luc->attr.num_subbuf = chan->attr.num_subbuf;
luc->attr.switch_timer_interval = chan->attr.switch_timer_interval;
luc->attr.read_timer_interval = chan->attr.read_timer_interval;
- luc->attr.output = chan->attr.output;
+ luc->attr.output = (enum lttng_ust_output) chan->attr.output;
/* Translate to UST output enum */
switch (luc->attr.output) {
return luc;
error_free_channel:
+ lttng_ht_destroy(luc->ctx);
+ lttng_ht_destroy(luc->events);
free(luc);
error:
return NULL;
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,
*/
void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
{
+ if (!metadata->handle) {
+ return;
+ }
DBG2("Trace UST destroy metadata %d", metadata->handle);
-
free(metadata);
}
rcu_read_lock();
- DBG2("Trace UST destroy session %d", session->id);
+ DBG2("Trace UST destroy session %u", session->id);
/* Cleaning up UST domain */
destroy_domain_global(&session->domain_global);