X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=4f06f1b06d149635080e99edc616978cca3ae7ba;hb=309fc9bf0c244ed47c4d7c3a47119e596a40eb73;hp=0e386aa0327f2f430806321766e2a4e2516b64dc;hpb=6c1c0768320135c6936c371b09731851b508c023;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 0e386aa03..4f06f1b06 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -366,6 +366,7 @@ error:
 
 /*
  * Allocate and initialize a ust event. Set name and event type.
+ * We own filter_expression, filter, and exclusion.
  *
  * Return pointer to structure or NULL.
  */
@@ -441,6 +442,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 error_free_event:
 	free(lue);
 error:
+	free(filter_expression);
+	free(filter);
+	free(exclusion);
 	return NULL;
 }
 
@@ -466,7 +470,12 @@ int trace_ust_context_type_event_to_ust(enum lttng_event_context_type type)
 		utype = LTTNG_UST_CONTEXT_IP;
 		break;
 	case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER:
-		utype = LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER;
+		if (!ustctl_has_perf_counters()) {
+			utype = -1;
+			WARN("Perf counters not implemented in UST");
+		} else {
+			utype = LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER;
+		}
 		break;
 	default:
 		ERR("Invalid UST context");
@@ -755,11 +764,15 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(session->agents->ht, &iter.iter, agt, node.node) {
-		lttng_ht_del(session->agents, &iter);
+		int ret = lttng_ht_del(session->agents, &iter);
+
+		assert(!ret);
 		agent_destroy(agt);
 	}
 	rcu_read_unlock();
 
+	ht_cleanup_push(session->agents);
+
 	/* Cleanup UID buffer registry object(s). */
 	cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,
 			lnode) {