X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Ftracepoint.c;h=adb3f015c3627766e142d35a1917f426a8560b6d;hb=7ee76145ae6a7efc03968571b9e4a22d46e92929;hp=b556af89b3364d49ea4e0fb566fed3f1132f51d5;hpb=ae14f8220190e23cc9d9ec6023c1813a8fb2ad32;p=lttng-ust.git

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index b556af89..adb3f015 100644
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -1,21 +1,9 @@
 /*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
  * Copyright (C) 2008-2011 Mathieu Desnoyers
  * Copyright (C) 2009 Pierre-Marc Fournier
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- *
  * Ported to userspace by Pierre-Marc Fournier.
  */
 
@@ -36,7 +24,7 @@
 #include <lttng/ust-abi.h>	/* for LTTNG_UST_SYM_NAME_LEN */
 
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #include "tracepoint-internal.h"
 #include "lttng-tracer-core.h"
@@ -157,7 +145,7 @@ static void release_probes(void *old)
 	if (old) {
 		struct tp_probes *tp_probes = caa_container_of(old,
 			struct tp_probes, probes[0]);
-		lttng_ust_synchronize_trace();
+		lttng_ust_urcu_synchronize_rcu();
 		free(tp_probes);
 	}
 }
@@ -741,7 +729,7 @@ void __tracepoint_probe_prune_release_queue(void)
 	release_queue_need_update = 0;
 
 	/* Wait for grace period between all sync_callsites and free. */
-	lttng_ust_synchronize_trace();
+	lttng_ust_urcu_synchronize_rcu();
 
 	cds_list_for_each_entry_safe(pos, next, &release_probes, u.list) {
 		cds_list_del(&pos->u.list);
@@ -832,7 +820,7 @@ void tracepoint_probe_update_all(void)
 
 	tracepoint_update_probes();
 	/* Wait for grace period between update_probes and free. */
-	lttng_ust_synchronize_trace();
+	lttng_ust_urcu_synchronize_rcu();
 	cds_list_for_each_entry_safe(pos, next, &release_probes, u.list) {
 		cds_list_del(&pos->u.list);
 		free(pos);
@@ -876,7 +864,7 @@ int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_sta
 {
 	struct tracepoint_lib *pl, *iter;
 
-	init_tracepoint();
+	lttng_ust_tp_init();
 
 	pl = (struct tracepoint_lib *) zmalloc(sizeof(struct tracepoint_lib));
 	if (!pl) {
@@ -909,7 +897,7 @@ lib_added:
 
 	DBG("just registered a tracepoints section from %p and having %d tracepoints",
 		tracepoints_start, tracepoints_count);
-	if (ust_debug()) {
+	if (ust_err_debug_enabled()) {
 		int i;
 
 		for (i = 0; i < tracepoints_count; i++) {
@@ -968,15 +956,15 @@ static void check_weak_hidden(void)
 			"DIFFERENT addresses");
 }
 
-void init_tracepoint(void)
+void lttng_ust_tp_init(void)
 {
 	if (uatomic_xchg(&initialized, 1) == 1)
 		return;
-	init_usterr();
+	ust_err_init();
 	check_weak_hidden();
 }
 
-void exit_tracepoint(void)
+void lttng_ust_tp_exit(void)
 {
 	initialized = 0;
 }
@@ -1027,8 +1015,3 @@ int tp_get_destructors_state(void)
 {
 	return uatomic_read(&tracepoint_destructors_state);
 }
-
-void lttng_ust_synchronize_trace(void)
-{
-	lttng_ust_urcu_synchronize_rcu();
-}