X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;fp=liblttng-ust%2Flttng-events.c;h=fefd5e63c7035faffd92aee070acecc877debdbf;hb=3a38e72c90e7b93ef9bb86f506d5850e1985f363;hp=25b4962583a833811014cf50558f46ea4a5aa7e3;hpb=11dc92881a4e8cd59ed66387a0fbe9b409d88f79;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 25b49625..fefd5e63 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -174,7 +174,7 @@ void register_event(struct lttng_event *event)
 
 	assert(event->registered == 0);
 	desc = event->desc;
-	ret = __tracepoint_probe_register(desc->name,
+	ret = __tracepoint_probe_register_queue_release(desc->name,
 			desc->probe_callback,
 			event, desc->signature);
 	WARN_ON_ONCE(ret);
@@ -190,7 +190,7 @@ void unregister_event(struct lttng_event *event)
 
 	assert(event->registered == 1);
 	desc = event->desc;
-	ret = __tracepoint_probe_unregister(desc->name,
+	ret = __tracepoint_probe_unregister_queue_release(desc->name,
 			desc->probe_callback,
 			event);
 	WARN_ON_ONCE(ret);
@@ -219,6 +219,7 @@ void lttng_session_destroy(struct lttng_session *session)
 		_lttng_event_unregister(event);
 	}
 	synchronize_trace();	/* Wait for in-flight events to complete */
+	__tracepoint_probe_prune_release_queue();
 	cds_list_for_each_entry_safe(enabler, tmpenabler,
 			&session->enablers_head, node)
 		lttng_enabler_destroy(enabler);
@@ -933,6 +934,7 @@ void lttng_session_sync_enablers(struct lttng_session *session)
 			lttng_filter_sync_state(runtime);
 		}
 	}
+	__tracepoint_probe_prune_release_queue();
 }
 
 /*