X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.c;h=a7c853530d0ab7db9906c588d7da72c9a4e3ced5;hb=5d56b5aa74fa8efaa677c0a97d577b114d3e27e6;hp=e912c53c7e0face7ca1720752f45dc36b709e777;hpb=322585731ced1adba36cddcb8bdd5d997d1b2e3e;p=lttng-tools.git

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index e912c53c7..a7c853530 100644
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -92,13 +92,14 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
 	/* Allocate a new ltt ust session */
 	lus = malloc(sizeof(struct ltt_ust_session));
 	if (lus == NULL) {
-		perror("create ust session malloc");
+		PERROR("create ust session malloc");
 		goto error;
 	}
 
 	/* Init data structure */
 	lus->consumer_fds_sent = 0;
 	lus->uid = uid;
+	lus->start_trace = 0;
 
 	/* Alloc UST domain hash tables */
 	lus->domain_pid = hashtable_new(0);
@@ -111,13 +112,15 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
 	ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
 	if (ret < 0) {
 		PERROR("snprintf kernel traces path");
-		goto error;
+		goto error_free_session;
 	}
 
 	DBG2("UST trace session create successful");
 
 	return lus;
 
+error_free_session:
+	free(lus);
 error:
 	return NULL;
 }
@@ -168,13 +171,15 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 	ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
 	if (ret < 0) {
 		perror("asprintf ust create channel");
-		goto error;
+		goto error_free_channel;
 	}
 
 	DBG2("Trace UST channel %s created", luc->name);
 
 	return luc;
 
+error_free_channel:
+	free(luc);
 error:
 	return NULL;
 }
@@ -209,7 +214,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 		break;
 	default:
 		ERR("Unknown ust instrumentation type (%d)", ev->type);
-		goto error;
+		goto error_free_event;
 	}
 
 	/* Copy event name */
@@ -220,10 +225,12 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	hashtable_node_init(&lue->node, (void *) lue->attr.name,
 			strlen(lue->attr.name));
 	/* Alloc context hash tables */
-	lue->ctx = hashtable_new_str(5);
+	lue->ctx = hashtable_new_str(0);
 
 	return lue;
 
+error_free_event:
+	free(lue);
 error:
 	return NULL;
 }
@@ -250,18 +257,20 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 	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;
-	lum->attr.output = DEFAULT_UST_CHANNEL_OUTPUT;
+	lum->attr.output = LTTNG_UST_MMAP;
 
 	lum->handle = -1;
 	/* Set metadata trace path */
 	ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
 	if (ret < 0) {
 		perror("asprintf ust metadata");
-		goto error;
+		goto error_free_metadata;
 	}
 
 	return lum;
 
+error_free_metadata:
+	free(lum);
 error:
 	return NULL;
 }