X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fmarker.c;h=96d140996890c40c5b4a43da45a63a4180aad7d3;hb=8d6300d3b3cb0219e1109e931a2219dbd812b24d;hp=664f59c61c6495229ba4661206e267b5e5a7635c;hpb=eb5d20c68aaf73661ffc02ba8fea3683c0358702;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index 664f59c..96d1409 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -35,8 +35,8 @@
 __thread long ust_reg_stack[500];
 volatile __thread long *ust_reg_stack_ptr = (long *) 0;
 
-extern struct marker * const __start___markers[] __attribute__((visibility("hidden")));
-extern struct marker * const __stop___markers[] __attribute__((visibility("hidden")));
+extern struct marker * const __start___markers_ptrs[] __attribute__((visibility("hidden")));
+extern struct marker * const __stop___markers_ptrs[] __attribute__((visibility("hidden")));
 
 /* Set to 1 to enable marker debug output */
 static const int marker_debug;
@@ -685,26 +685,14 @@ void marker_update_probe_range(struct marker * const *begin,
 
 	pthread_mutex_lock(&markers_mutex);
 	for (iter = begin; iter < end; iter++) {
+		if (!*iter)
+			continue;	/* skip dummy */
 		mark_entry = get_marker((*iter)->channel, (*iter)->name);
 		if (mark_entry) {
 			set_marker(mark_entry, *iter, !!mark_entry->refcount);
 			/*
 			 * ignore error, continue
 			 */
-
-			/* This is added for UST. We emit a core_marker_id event
-			 * for markers that are already registered to a probe
-			 * upon library load. Otherwise, no core_marker_id will
-			 * be generated for these markers. Is this the right thing
-			 * to do?
-			 */
-			trace_mark(metadata, core_marker_id,
-				   "channel %s name %s event_id %hu "
-				   "int #1u%zu long #1u%zu pointer #1u%zu "
-				   "size_t #1u%zu alignment #1u%u",
-				   (*iter)->channel, (*iter)->name, mark_entry->event_id,
-				   sizeof(int), sizeof(long), sizeof(void *),
-				   sizeof(size_t), ltt_get_alignment());
 		} else {
 			disable_marker(*iter);
 		}
@@ -743,10 +731,6 @@ static void lib_update_markers(void)
  */
 static void marker_update_probes(void)
 {
-	/* Core kernel markers */
-//ust//	marker_update_probe_range(__start___markers, __stop___markers);
-	/* Markers in modules. */
-//ust//	module_update_markers();
 	lib_update_markers();
 	tracepoint_probe_update_all();
 	/* Update immediate values */
@@ -1118,12 +1102,14 @@ int marker_get_iter_range(struct marker * const **marker,
 	struct marker * const *begin,
 	struct marker * const *end)
 {
-	if (!*marker && begin != end) {
+	if (!*marker && begin != end)
 		*marker = begin;
-		return 1;
+	while (*marker >= begin && *marker < end) {
+		if (!**marker)
+			(*marker)++;	/* skip dummy */
+		else
+			return 1;
 	}
-	if (*marker >= begin && *marker < end)
-		return 1;
 	return 0;
 }
 //ust// EXPORT_SYMBOL_GPL(marker_get_iter_range);
@@ -1132,17 +1118,7 @@ static void marker_get_iter(struct marker_iter *iter)
 {
 	int found = 0;
 
-	/* 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)
-			goto end;
-	}
-	/* Markers in modules. */
 	found = lib_get_iter_markers(iter);
-end:
 	if (!found)
 		marker_iter_reset(iter);
 }
@@ -1356,15 +1332,17 @@ static void new_markers(struct marker * const *start, struct marker * const *end
 {
 	if (new_marker_cb) {
 		struct marker * const *m;
-		for(m=start; m < end; m++) {
-			new_marker_cb(*m);
+
+		for(m = start; m < end; m++) {
+			if (*m)
+				new_marker_cb(*m);
 		}
 	}
 }
 
 int marker_register_lib(struct marker * const *markers_start, int markers_count)
 {
-	struct lib *pl;
+	struct lib *pl, *iter;
 
 	pl = (struct lib *) zmalloc(sizeof(struct lib));
 
@@ -1373,7 +1351,21 @@ int marker_register_lib(struct marker * const *markers_start, int markers_count)
 
 	/* FIXME: maybe protect this with its own mutex? */
 	lock_markers();
+
+	/*
+	 * We sort the libs by struct lib pointer address.
+	 */
+	cds_list_for_each_entry_reverse(iter, &libs, list) {
+		BUG_ON(iter == pl);    /* Should never be in the list twice */
+		if (iter < pl) {
+			/* We belong to the location right after iter. */
+			cds_list_add(&pl->list, &iter->list);
+			goto lib_added;
+		}
+	}
+	/* We should be added at the head of the list */
 	cds_list_add(&pl->list, &libs);
+lib_added:
 	unlock_markers();
 
 	new_markers(markers_start, markers_start + markers_count);
@@ -1381,7 +1373,7 @@ int marker_register_lib(struct marker * const *markers_start, int markers_count)
 	/* FIXME: update just the loaded lib */
 	lib_update_markers();
 
-	DBG("just registered a markers section from %p and having %d markers", markers_start, markers_count);
+	DBG("just registered a markers section from %p and having %d markers (minus dummy markers)", markers_start, markers_count);
 	
 	return 0;
 }
@@ -1415,15 +1407,15 @@ static int initialized = 0;
 
 void __attribute__((constructor)) init_markers(void)
 {
-	if(!initialized) {
-		marker_register_lib(__start___markers,
-			(((long)__stop___markers) - ((long)__start___markers))
-				/ sizeof(*__start___markers));
+	if (!initialized) {
+		marker_register_lib(__start___markers_ptrs,
+			__stop___markers_ptrs
+			- __start___markers_ptrs);
 		initialized = 1;
 	}
 }
 
-void __attribute__((constructor)) destroy_markers(void)
+void __attribute__((destructor)) destroy_markers(void)
 {
-	marker_unregister_lib(__start___markers);
+	marker_unregister_lib(__start___markers_ptrs);
 }