X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=96f8eb0b3ead316c0defa96905ff40cfcccb3136;hp=81b1f418a97b78a5a01ed7300f50fd2d38f0413d;hb=0f83395d5e0e927fdab025eae023e68e9021af26;hpb=d8fbe2a9cc6ace367bfb5428df3e7649ac012f32

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 81b1f418a..96f8eb0b3 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -976,9 +976,10 @@ static struct ust_app_session *create_ust_app_session(
 		ret = ustctl_create_session(app->sock);
 		if (ret < 0) {
 			ERR("Creating session for app pid %d", app->pid);
+			delete_ust_app_session(-1, ua_sess);
 			/* This means that the tracer is gone... */
 			ua_sess = (void*) -1UL;
-			goto error;
+			goto end;
 		}
 
 		ua_sess->handle = ret;
@@ -993,11 +994,6 @@ static struct ust_app_session *create_ust_app_session(
 end:
 	health_code_update(&health_thread_cmd);
 	return ua_sess;
-
-error:
-	delete_ust_app_session(-1, ua_sess);
-	health_code_update(&health_thread_cmd);
-	return NULL;
 }
 
 /*
@@ -1579,12 +1575,15 @@ int ust_app_list_events(struct lttng_event **events)
 						&uiter)) != -ENOENT) {
 			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
+				/* In case the realloc fails, we free the memory */
+				void *tmp_ptr = (void *) tmp;
 				DBG2("Reallocating event list from %zu to %zu entries", nbmem,
 						2 * nbmem);
 				nbmem *= 2;
 				tmp = realloc(tmp, nbmem * sizeof(struct lttng_event));
 				if (tmp == NULL) {
 					PERROR("realloc ust app events");
+					free(tmp_ptr);
 					ret = -ENOMEM;
 					goto rcu_error;
 				}
@@ -1654,12 +1653,15 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 						&uiter)) != -ENOENT) {
 			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
+				/* In case the realloc fails, we free the memory */
+				void *tmp_ptr = (void *) tmp;
 				DBG2("Reallocating event field list from %zu to %zu entries", nbmem,
 						2 * nbmem);
 				nbmem *= 2;
 				tmp = realloc(tmp, nbmem * sizeof(struct lttng_event_field));
 				if (tmp == NULL) {
 					PERROR("realloc ust app event fields");
+					free(tmp_ptr);
 					ret = -ENOMEM;
 					goto rcu_error;
 				}
@@ -1667,7 +1669,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 
 			memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp[count].type = uiter.type;
-			tmp[count].written = uiter.written;
+			tmp[count].nowrite = uiter.nowrite;
 
 			memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp[count].event.loglevel = uiter.loglevel;
@@ -1696,21 +1698,22 @@ error:
 void ust_app_clean_list(void)
 {
 	int ret;
+	struct ust_app *app;
 	struct lttng_ht_iter iter;
-	struct lttng_ht_node_ulong *node;
 
 	DBG2("UST app cleaning registered apps hash table");
 
 	rcu_read_lock();
 
-	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, node, node) {
+	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
 		ret = lttng_ht_del(ust_app_ht, &iter);
 		assert(!ret);
-		call_rcu(&node->head, delete_ust_app_rcu);
+		call_rcu(&app->pid_n.head, delete_ust_app_rcu);
 	}
 
 	/* Cleanup socket hash table */
-	cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, node, node) {
+	cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, app,
+			sock_n.node) {
 		ret = lttng_ht_del(ust_app_ht_by_sock, &iter);
 		assert(!ret);
 	}
@@ -2239,7 +2242,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 			/* Order is important */
 			cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
 			ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u",
-					ua_chan->name, ua_chan->streams.count++);
+					ua_chan->name, ua_chan->streams.count);
+			ua_chan->streams.count++;
 			if (ret < 0) {
 				PERROR("asprintf UST create stream");
 				/*