X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fmarker.c;h=8b120195677690186839884ab5cfbb940546bef7;hb=3ea1e2fc7178db75f09e3d5630516858c8a783d5;hp=39da7f40f08338a69ae85cc6915cac303376390e;hpb=48454c953fc1117fbbbe5fc7bc23b6cd28b50d32;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index 39da7f4..8b12019 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -31,7 +31,7 @@
 //ust// #include <linux/ltt-tracer.h>
 
 #define _LGPL_SOURCE
-#include <urcu.h>
+#include <urcu-bp.h>
 
 #include "kernelcompat.h"
 
@@ -43,6 +43,8 @@
 
 extern struct marker __start___markers[] __attribute__((visibility("hidden")));
 extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
+extern struct marker_addr __start___marker_addr[] __attribute__((visibility("hidden")));
+extern struct marker_addr __stop___marker_addr[] __attribute__((visibility("hidden")));
 
 /* Set to 1 to enable marker debug output */
 static const int marker_debug;
@@ -53,6 +55,9 @@ static const int marker_debug;
  */
 static DEFINE_MUTEX(markers_mutex);
 
+static LIST_HEAD(libs);
+
+
 void lock_markers(void)
 {
 	mutex_lock(&markers_mutex);
@@ -631,9 +636,9 @@ static int set_marker(struct marker_entry *entry, struct marker *elem,
  */
 static void disable_marker(struct marker *elem)
 {
-	int ret;
-
-	/* leave "call" as is. It is known statically. */
+//ust//	int ret;
+//ust//
+//ust//	/* leave "call" as is. It is known statically. */
 //ust//	if (elem->tp_name && _imv_read(elem->state)) {
 //ust//		WARN_ON(!elem->tp_cb);
 //ust//		/*
@@ -703,6 +708,18 @@ void marker_update_probe_range(struct marker *begin,
 	mutex_unlock(&markers_mutex);
 }
 
+static void lib_update_markers(void)
+{
+	struct lib *lib;
+
+	/* FIXME: we should probably take a mutex here on libs */
+//ust//	mutex_lock(&module_mutex);
+	list_for_each_entry(lib, &libs, list)
+		marker_update_probe_range(lib->markers_start,
+				lib->markers_start + lib->markers_count);
+//ust//	mutex_unlock(&module_mutex);
+}
+
 /*
  * Update probes, removing the faulty probes.
  *
@@ -808,6 +825,7 @@ int marker_probe_register(const char *channel, const char *name,
 	}
 	mutex_unlock(&markers_mutex);
 
+	/* Activate marker if necessary */
 	marker_update_probes();
 
 	mutex_lock(&markers_mutex);
@@ -1056,6 +1074,33 @@ void *marker_get_private_data(const char *channel, const char *name,
 
 //ust//#ifdef CONFIG_MODULES
 
+/*
+ * Returns 0 if current not found.
+ * Returns 1 if current found.
+ */
+int lib_get_iter_markers(struct marker_iter *iter)
+{
+	struct lib *iter_lib;
+	int found = 0;
+
+//ust//	mutex_lock(&module_mutex);
+	list_for_each_entry(iter_lib, &libs, list) {
+		if (iter_lib < iter->lib)
+			continue;
+		else if (iter_lib > iter->lib)
+			iter->marker = NULL;
+		found = marker_get_iter_range(&iter->marker,
+			iter_lib->markers_start,
+			iter_lib->markers_start + iter_lib->markers_count);
+		if (found) {
+			iter->lib = iter_lib;
+			break;
+		}
+	}
+//ust//	mutex_unlock(&module_mutex);
+	return found;
+}
+
 /**
  * marker_get_iter_range - Get a next marker iterator given a range.
  * @marker: current markers (in), next marker (out)
@@ -1436,47 +1481,6 @@ void ltt_dump_marker_state(struct ltt_trace_struct *trace)
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_dump_marker_state);
 
-
-static LIST_HEAD(libs);
-
-/*
- * Returns 0 if current not found.
- * Returns 1 if current found.
- */
-int lib_get_iter_markers(struct marker_iter *iter)
-{
-	struct lib *iter_lib;
-	int found = 0;
-
-//ust//	mutex_lock(&module_mutex);
-	list_for_each_entry(iter_lib, &libs, list) {
-		if (iter_lib < iter->lib)
-			continue;
-		else if (iter_lib > iter->lib)
-			iter->marker = NULL;
-		found = marker_get_iter_range(&iter->marker,
-			iter_lib->markers_start,
-			iter_lib->markers_start + iter_lib->markers_count);
-		if (found) {
-			iter->lib = iter_lib;
-			break;
-		}
-	}
-//ust//	mutex_unlock(&module_mutex);
-	return found;
-}
-
-void lib_update_markers(void)
-{
-	struct lib *lib;
-
-//ust//	mutex_lock(&module_mutex);
-	list_for_each_entry(lib, &libs, list)
-		marker_update_probe_range(lib->markers_start,
-				lib->markers_start + lib->markers_count);
-//ust//	mutex_unlock(&module_mutex);
-}
-
 static void (*new_marker_cb)(struct marker *) = NULL;
 
 void marker_set_new_marker_cb(void (*cb)(struct marker *))
@@ -1494,15 +1498,22 @@ static void new_markers(struct marker *start, struct marker *end)
 	}
 }
 
-int marker_register_lib(struct marker *markers_start, int markers_count)
+int marker_register_lib(struct marker *markers_start, struct marker_addr *marker_addr_start, int markers_count)
 {
 	struct lib *pl;
+	struct marker_addr *addr;
 
 	pl = (struct lib *) malloc(sizeof(struct lib));
 
 	pl->markers_start = markers_start;
+	pl->markers_addr_start = marker_addr_start;
 	pl->markers_count = markers_count;
 
+	lock_markers();
+	for(addr = marker_addr_start; addr < marker_addr_start + markers_count; addr++)
+		addr->marker->location = addr->addr;
+	unlock_markers();
+
 	/* FIXME: maybe protect this with its own mutex? */
 	lock_markers();
 	list_add(&pl->list, &libs);
@@ -1531,8 +1542,8 @@ static int initialized = 0;
 void __attribute__((constructor)) init_markers(void)
 {
 	if(!initialized) {
-		marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));
-		printf("markers_start: %p, markers_stop: %p\n", __start___markers, __stop___markers);
+		marker_register_lib(__start___markers, __start___marker_addr, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));
+		//DBG("markers_start: %p, markers_stop: %p\n", __start___markers, __stop___markers);
 		initialized = 1;
 	}
 }