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 54515ef1b7d357613a4681a89ac25de8933c7a8d..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);
 
@@ -148,7 +149,7 @@ lib_added:
        pthread_mutex_unlock(&trace_events_mutex);
 
        /* trace_events_count - 1: skip dummy */
-       DBG("just registered a trace_events section from %p and having %d trace_events", trace_events_start, trace_events_count - 1);
+       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;
 }