X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Ftracepoint.c;h=1e252ce39d859fc10cc1766757db9ace908da7fe;hb=25c9a6e9fdb95d9d1c57463ab513ab1db197128d;hp=578b0f5151d3fecddf8a4321e54ac46d8f97ca23;hpb=f280cb51b6f0c84f7248c9857cfc66d45aed413e;p=lttng-ust.git

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index 578b0f51..1e252ce3 100644
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -21,20 +21,24 @@
 
 #define _LGPL_SOURCE
 #include <errno.h>
-#include <lttng/tracepoint.h>
-#include <lttng/core.h>
 #include <stdint.h>
 #include <stddef.h>
+
 #include <urcu/arch.h>
 #include <urcu-bp.h>
 #include <urcu/hlist.h>
 #include <urcu/uatomic.h>
 #include <urcu/compiler.h>
 
-#include <lttng/usterr-signal-safe.h>
+#include <lttng/tracepoint.h>
+
+#include <usterr-signal-safe.h>
+#include <helper.h>
+
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "jhash.h"
+#include "error.h"
 
 /* Set to 1 to enable tracepoint debug output */
 static const int tracepoint_debug;
@@ -402,8 +406,6 @@ int __tracepoint_probe_unregister(const char *name, void *probe, void *data)
 {
 	void *old;
 
-	fprintf(stderr, "TEST REGISTER %s\n", name);
-
 	old = tracepoint_remove_probe(name, probe, data);
 	if (IS_ERR(old))
 		return PTR_ERR(old);
@@ -493,7 +495,7 @@ void tracepoint_probe_update_all(void)
  * Returns 0 if current not found.
  * Returns 1 if current found.
  *
- * Called with tracepoint mutex held
+ * Called with UST lock held
  */
 int lib_get_iter_tracepoints(struct tracepoint_iter *iter)
 {
@@ -525,7 +527,7 @@ int lib_get_iter_tracepoints(struct tracepoint_iter *iter)
  * Returns whether a next tracepoint has been found (1) or not (0).
  * Will return the first tracepoint in the range if the input tracepoint is
  * NULL.
- * Called with tracepoint mutex held.
+ * Called with UST lock held.
  */
 int tracepoint_get_iter_range(struct tracepoint * const **tracepoint,
 	struct tracepoint * const *begin, struct tracepoint * const *end)
@@ -542,7 +544,7 @@ int tracepoint_get_iter_range(struct tracepoint * const **tracepoint,
 }
 
 /*
- * Called with tracepoint mutex held.
+ * Called with UST lock held.
  */
 static void tracepoint_get_iter(struct tracepoint_iter *iter)
 {
@@ -571,7 +573,7 @@ void tracepoint_iter_next(struct tracepoint_iter *iter)
 	/*
 	 * iter->tracepoint may be invalid because we blindly incremented it.
 	 * Make sure it is valid by marshalling on the tracepoints, getting the
-	 * tracepoints from following modules if necessary.
+	 * tracepoints from following library if necessary.
 	 */
 	tracepoint_get_iter(iter);
 }