X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-probes.c;h=a0e9fffa134237ab7e67838ddeae8b028ba649bf;hb=612e9ce4e5cc3a1292522a563789f6aab6c421b1;hp=553770ea2954049fdaa311477c16f71e2e8521ca;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-probes.c b/src/lib/lttng-ust/lttng-probes.c
index 553770ea..a0e9fffa 100644
--- a/src/lib/lttng-ust/lttng-probes.c
+++ b/src/lib/lttng-ust/lttng-probes.c
@@ -13,15 +13,14 @@
 #include <urcu/hlist.h>
 #include <lttng/ust-events.h>
 #include <lttng/tracepoint.h>
-#include "tracepoint-internal.h"
+#include "common/tracepoint.h"
 #include <assert.h>
 #include "common/macros.h"
 #include <ctype.h>
 
 #include "lttng-tracer-core.h"
-#include "jhash.h"
-#include "error.h"
-#include "ust-events-internal.h"
+#include "common/jhash.h"
+#include "lib/lttng-ust/events.h"
 
 /*
  * probe list is protected by ust_lock()/ust_unlock().
@@ -77,7 +76,7 @@ void lttng_lazy_probe_register(struct lttng_ust_registered_probe *reg_probe)
 
 	/*
 	 * The provider ensures there are no duplicate event names.
-	 * Duplicated TRACEPOINT_EVENT event names would generate a
+	 * Duplicated LTTNG_UST_TRACEPOINT_EVENT event names would generate a
 	 * compile-time error due to duplicated symbol names.
 	 */
 
@@ -260,7 +259,7 @@ int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list)
 			cds_list_add(&list_entry->head, &list->head);
 			lttng_ust_format_event_name(event_desc, list_entry->tp.name);
 			if (!event_desc->loglevel) {
-				list_entry->tp.loglevel = TRACE_DEFAULT;
+				list_entry->tp.loglevel = LTTNG_UST_TRACEPOINT_LOGLEVEL_DEFAULT;
 			} else {
 				list_entry->tp.loglevel = *(*event_desc->loglevel);
 			}
@@ -342,7 +341,7 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 				list_entry->field.field_name[0] = '\0';
 				list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER;
 				if (!event_desc->loglevel) {
-					list_entry->field.loglevel = TRACE_DEFAULT;
+					list_entry->field.loglevel = LTTNG_UST_TRACEPOINT_LOGLEVEL_DEFAULT;
 				} else {
 					list_entry->field.loglevel = *(*event_desc->loglevel);
 				}
@@ -395,7 +394,7 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 					list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER;
 				}
 				if (!event_desc->loglevel) {
-					list_entry->field.loglevel = TRACE_DEFAULT;
+					list_entry->field.loglevel = LTTNG_UST_TRACEPOINT_LOGLEVEL_DEFAULT;
 				} else {
 					list_entry->field.loglevel = *(*event_desc->loglevel);
 				}