X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-tracepoint%2Ftracepoint.c;h=38d57cec626c8181b86bf9acf48bfb3f2187ec13;hb=4c155a06d838e1ab5d385abd1d73ae56e71b7d5e;hp=2e9a2c0960761cf5348f063e187d515f78f3449d;hpb=0274f7f24e55825f2a51804d50100676d468c06d;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-tracepoint/tracepoint.c b/src/lib/lttng-ust-tracepoint/tracepoint.c
index 2e9a2c09..38d57cec 100644
--- a/src/lib/lttng-ust-tracepoint/tracepoint.c
+++ b/src/lib/lttng-ust-tracepoint/tracepoint.c
@@ -74,8 +74,8 @@ static CDS_LIST_HEAD(libs);
  * The tracepoint mutex protects the library tracepoints, the hash table, and
  * the library list.
  * All calls to the tracepoint API must be protected by the tracepoint mutex,
- * excepts calls to tracepoint_register_lib and
- * tracepoint_unregister_lib, which take the tracepoint mutex themselves.
+ * excepts calls to lttng_ust_tracepoint_module_register and
+ * lttng_ust_tracepoint_module_unregister, which take the tracepoint mutex themselves.
  */
 
 /*
@@ -608,7 +608,7 @@ static void tracepoint_release_queue_add_old_probes(void *old)
 }
 
 /**
- * lttng_ust_tracepoint_probe_register -  Connect a probe to a tracepoint
+ * lttng_ust_tracepoint_provider_register -  Connect a probe to a tracepoint
  * @name: tracepoint provider name
  * @name: tracepoint event name
  * @probe: probe handler
@@ -617,7 +617,7 @@ static void tracepoint_release_queue_add_old_probes(void *old)
  * The probe address must at least be aligned on the architecture pointer size.
  * Called with the tracepoint mutex held.
  */
-int lttng_ust_tracepoint_probe_register(const char *provider_name, const char *event_name,
+int lttng_ust_tracepoint_provider_register(const char *provider_name, const char *event_name,
 		void (*probe)(void), void *data, const char *signature)
 {
 	void *old;
@@ -690,7 +690,7 @@ static void *tracepoint_remove_probe(const char *provider_name, const char *even
  * @probe: probe function pointer
  * @probe: probe data pointer
  */
-int lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name,
+int lttng_ust_tracepoint_provider_unregister(const char *provider_name, const char *event_name,
 		void (*probe)(void), void *data)
 {
 	void *old;
@@ -877,9 +877,9 @@ static void new_tracepoints(struct lttng_ust_tracepoint * const *start,
  * against recent liblttng-ust headers require a recent liblttng-ust
  * runtime for those tracepoints to be taken into account.
  */
-int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start,
+int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start,
 			     int tracepoints_count);
-int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start,
+int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start,
 			     int tracepoints_count)
 {
 	struct tracepoint_lib *pl, *iter;
@@ -932,8 +932,8 @@ lib_added:
 	return 0;
 }
 
-int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start);
-int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start)
+int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start);
+int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start)
 {
 	struct tracepoint_lib *lib;
 
@@ -998,24 +998,24 @@ void lttng_ust_tp_exit(void)
 /*
  * Create the wrapper symbols.
  */
-#undef tp_rcu_read_lock
-#undef tp_rcu_read_unlock
-#undef tp_rcu_dereference
+#undef lttng_ust_tp_rcu_read_lock
+#undef lttng_ust_tp_rcu_read_unlock
+#undef lttng_ust_tp_rcu_dereference
 
-void tp_rcu_read_lock(void);
-void tp_rcu_read_lock(void)
+void lttng_ust_tp_rcu_read_lock(void);
+void lttng_ust_tp_rcu_read_lock(void)
 {
 	lttng_ust_urcu_read_lock();
 }
 
-void tp_rcu_read_unlock(void);
-void tp_rcu_read_unlock(void)
+void lttng_ust_tp_rcu_read_unlock(void);
+void lttng_ust_tp_rcu_read_unlock(void)
 {
 	lttng_ust_urcu_read_unlock();
 }
 
-void *tp_rcu_dereference_sym(void *p);
-void *tp_rcu_dereference_sym(void *p)
+void *lttng_ust_tp_rcu_dereference_sym(void *p);
+void *lttng_ust_tp_rcu_dereference_sym(void *p)
 {
 	return lttng_ust_rcu_dereference(p);
 }
@@ -1023,16 +1023,16 @@ void *tp_rcu_dereference_sym(void *p)
 /*
  * Programs that have threads that survive after they exit, and therefore call
  * library destructors, should disable the tracepoint destructors by calling
- * tp_disable_destructors(). This will leak the tracepoint
+ * lttng_ust_tp_disable_destructors(). This will leak the tracepoint
  * instrumentation library shared object, leaving its teardown to the operating
  * system process teardown.
  *
  * To access and/or modify this value, users need to use a combination of
  * dlopen(3) and dlsym(3) to get an handle on the
- * tp_disable_destructors and tp_get_destructors_state symbols below.
+ * lttng_ust_tp_disable_destructors and lttng_ust_tp_get_destructors_state symbols below.
  */
-void tp_disable_destructors(void);
-void tp_disable_destructors(void)
+void lttng_ust_tp_disable_destructors(void);
+void lttng_ust_tp_disable_destructors(void)
 {
 	uatomic_set(&tracepoint_destructors_state, 0);
 }
@@ -1041,8 +1041,8 @@ void tp_disable_destructors(void)
  * Returns 1 if the destructors are enabled and should be executed.
  * Returns 0 if the destructors are disabled.
  */
-int tp_get_destructors_state(void);
-int tp_get_destructors_state(void)
+int lttng_ust_tp_get_destructors_state(void);
+int lttng_ust_tp_get_destructors_state(void)
 {
 	return uatomic_read(&tracepoint_destructors_state);
 }