X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=libust%2Ftrace_event.c;h=6b30b68642dae769326d95f3691874e4f4d5c839;hb=8161463975e218e0833d31ab1577a7ceb9e8e9f3;hp=b54d361f2ae170e2bb64645b80ead4e51f149824;hpb=e2b465757cadd72353b3ce4ae2b9402d66750e3b;p=ust.git

diff --git a/libust/trace_event.c b/libust/trace_event.c
index b54d361..6b30b68 100644
--- a/libust/trace_event.c
+++ b/libust/trace_event.c
@@ -3,8 +3,8 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,15 +17,16 @@
  *
  */
 
+#define _LGPL_SOURCE
 #include <errno.h>
 #include <ust/tracepoint.h>
+#include <ust/tracepoint-internal.h>
 #include <ust/core.h>
 #include <ust/kcompat/kcompat.h>
-#include "usterr.h"
-
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 
+#include "usterr_signal_safe.h"
+
 /* libraries that contain trace_events (struct trace_event_lib) */
 static CDS_LIST_HEAD(libs);
 
@@ -72,15 +73,18 @@ int lib_get_iter_trace_events(struct trace_event_iter *iter)
  * Returns whether a next trace_event has been found (1) or not (0).
  * Will return the first trace_event in the range if the input trace_event is NULL.
  */
-int trace_event_get_iter_range(struct trace_event **trace_event, struct trace_event *begin,
-	struct trace_event *end)
+int trace_event_get_iter_range(struct trace_event * const **trace_event,
+	struct trace_event * const *begin,
+	struct trace_event * const *end)
 {
-	if (!*trace_event && begin != end) {
+	if (!*trace_event && begin != end)
 		*trace_event = begin;
-		return 1;
+	while (*trace_event >= begin && *trace_event < end) {
+		if (!**trace_event)
+			(*trace_event)++;	/* skip dummy */
+		else
+			return 1;
 	}
-	if (*trace_event >= begin && *trace_event < end)
-		return 1;
 	return 0;
 }
 
@@ -116,10 +120,10 @@ void trace_event_iter_reset(struct trace_event_iter *iter)
 	iter->trace_event = NULL;
 }
 
-int trace_event_register_lib(struct trace_event *trace_events_start,
+int trace_event_register_lib(struct trace_event * const *trace_events_start,
 			     int trace_events_count)
 {
-	struct trace_event_lib *pl;
+	struct trace_event_lib *pl, *iter;
 
 	pl = (struct trace_event_lib *) malloc(sizeof(struct trace_event_lib));
 
@@ -128,15 +132,29 @@ int trace_event_register_lib(struct trace_event *trace_events_start,
 
 	/* FIXME: maybe protect this with its own mutex? */
 	pthread_mutex_lock(&trace_events_mutex);
+	/*
+	 * 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:
 	pthread_mutex_unlock(&trace_events_mutex);
 
-	DBG("just registered a trace_events section from %p and having %d trace_events", trace_events_start, trace_events_count);
+	/* trace_events_count - 1: skip dummy */
+	DBG("just registered a trace_events section from %p and having %d trace_events (minus dummy trace_event)", trace_events_start, trace_events_count);
 
 	return 0;
 }
 
-int trace_event_unregister_lib(struct trace_event *trace_events_start)
+int trace_event_unregister_lib(struct trace_event * const *trace_events_start)
 {
 	struct trace_event_lib *lib;