Tracepoint and TRACEPOINT_EVENT API cleanup

[ust.git] / libust / trace_event.c

diff --git a/libust/trace_event.c b/libust/trace_event.c
index 2464d444807deb21ff8dd90853cd5484f6106022..6b30b68642dae769326d95f3691874e4f4d5c839 100644 (file)
--- 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);
 
@@ -76,12 +77,14 @@ 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;
 }
 
@@ -145,7 +148,8 @@ int trace_event_register_lib(struct trace_event * const *trace_events_start,
 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;
 }