X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Ftracepoint.c;h=e8241e8abd3cd29dfb0931f0edc2abbf17a43fe3;hb=c8fcf224e283ed7679c84cbcccf70ac65ca7e41d;hp=526ee00e58d130cd2093ab59e31078b7cdbf52b4;hpb=1af3d49e997e5585079ff917d2435e9380a071b7;p=lttng-ust.git

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index 526ee00e..e8241e8a 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;
@@ -487,105 +491,6 @@ void tracepoint_probe_update_all(void)
 	}
 }
 
-/*
- * Returns 0 if current not found.
- * Returns 1 if current found.
- *
- * Called with tracepoint mutex held
- */
-int lib_get_iter_tracepoints(struct tracepoint_iter *iter)
-{
-	struct tracepoint_lib *iter_lib;
-	int found = 0;
-
-	cds_list_for_each_entry(iter_lib, &libs, list) {
-		if (iter_lib < iter->lib)
-			continue;
-		else if (iter_lib > iter->lib)
-			iter->tracepoint = NULL;
-		found = tracepoint_get_iter_range(&iter->tracepoint,
-			iter_lib->tracepoints_start,
-			iter_lib->tracepoints_start + iter_lib->tracepoints_count);
-		if (found) {
-			iter->lib = iter_lib;
-			break;
-		}
-	}
-	return found;
-}
-
-/**
- * tracepoint_get_iter_range - Get a next tracepoint iterator given a range.
- * @tracepoint: current tracepoints (in), next tracepoint (out)
- * @begin: beginning of the range
- * @end: end of the range
- *
- * 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.
- */
-int tracepoint_get_iter_range(struct tracepoint * const **tracepoint,
-	struct tracepoint * const *begin, struct tracepoint * const *end)
-{
-	if (!*tracepoint && begin != end)
-		*tracepoint = begin;
-	while (*tracepoint >= begin && *tracepoint < end) {
-		if (!**tracepoint)
-			(*tracepoint)++;	/* skip dummy */
-		else
-			return 1;
-	}
-	return 0;
-}
-
-/*
- * Called with tracepoint mutex held.
- */
-static void tracepoint_get_iter(struct tracepoint_iter *iter)
-{
-	int found = 0;
-
-	/* tracepoints in libs. */
-	found = lib_get_iter_tracepoints(iter);
-	if (!found)
-		tracepoint_iter_reset(iter);
-}
-
-/*
- * Called with UST lock held.
- */
-void tracepoint_iter_start(struct tracepoint_iter *iter)
-{
-	tracepoint_get_iter(iter);
-}
-
-/*
- * Called with UST lock held.
- */
-void tracepoint_iter_next(struct tracepoint_iter *iter)
-{
-	iter->tracepoint++;
-	/*
-	 * 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.
-	 */
-	tracepoint_get_iter(iter);
-}
-
-/*
- * Called with UST lock held.
- */
-void tracepoint_iter_stop(struct tracepoint_iter *iter)
-{
-}
-
-void tracepoint_iter_reset(struct tracepoint_iter *iter)
-{
-	iter->tracepoint = NULL;
-}
-
 void tracepoint_set_new_tracepoint_cb(void (*cb)(struct tracepoint *))
 {
 	new_tracepoint_cb = cb;