X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libmarkers%2Fmarker.c;h=139b4327084528e2eb8e99f81eecfe30d1e43cf3;hb=c463904d75d0711fe6380ef0cda4ed07e6f7f969;hp=d31f2cfa97ebaaef8ca4c7ae4ef5ef0c78c8bc2c;hpb=98963de4a2dfae12d8aafa0f9a6d97cf4a44e12d;p=ust.git

diff --git a/libmarkers/marker.c b/libmarkers/marker.c
index d31f2cf..139b432 100644
--- a/libmarkers/marker.c
+++ b/libmarkers/marker.c
@@ -37,8 +37,8 @@
 #include "tracercore.h"
 #include "tracer.h"
 
-extern struct marker __start___markers[];
-extern struct marker __stop___markers[];
+extern struct marker __start___markers[] __attribute__((visibility("hidden")));
+extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
 
 /* Set to 1 to enable marker debug output */
 static const int marker_debug;
@@ -705,9 +705,10 @@ void marker_update_probe_range(struct marker *begin,
 static void marker_update_probes(void)
 {
 	/* Core kernel markers */
-	marker_update_probe_range(__start___markers, __stop___markers);
+//ust//	marker_update_probe_range(__start___markers, __stop___markers);
 	/* Markers in modules. */
 //ust//	module_update_markers();
+	lib_update_markers();
 //ust//	tracepoint_probe_update_all();
 	/* Update immediate values */
 	core_imv_update();
@@ -1062,6 +1063,7 @@ static void marker_get_iter(struct marker_iter *iter)
 
 	/* Core kernel markers */
 	if (!iter->lib) {
+		/* ust FIXME: how come we cannot disable the following line? we shouldn't need core stuff */
 		found = marker_get_iter_range(&iter->marker,
 				__start___markers, __stop___markers);
 		if (found)
@@ -1443,6 +1445,17 @@ int lib_get_iter_markers(struct marker_iter *iter)
 	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);
+}
+
 int marker_register_lib(struct marker *markers_start, int markers_count)
 {
 	struct lib *pl;
@@ -1458,3 +1471,9 @@ int marker_register_lib(struct marker *markers_start, int markers_count)
 	
 	return 0;
 }
+
+static void __attribute__((constructor)) __markers__init(void)
+{
+	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);
+}