Tracepoint API namespacing 'TRACEPOINT_LOGLEVEL'

[lttng-ust.git] / src / lib / lttng-ust / lttng-probes.c

diff --git a/src/lib/lttng-ust/lttng-probes.c b/src/lib/lttng-ust/lttng-probes.c
index b2e77e01247b517cecc131eea718a5b142e7a7d0..a0e9fffa134237ab7e67838ddeae8b028ba649bf 100644 (file)
--- a/src/lib/lttng-ust/lttng-probes.c
+++ b/src/lib/lttng-ust/lttng-probes.c
@@ -13,14 +13,13 @@
 #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 "common/jhash.h"
-#include "error.h"
 #include "lib/lttng-ust/events.h"
 
 /*
@@ -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);
                                }