Update loglevel names

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 52513d1278f832a92fcaac8dc615e3e668891c43..fa39b272d8ff19527fd065c7e393ac947b46c8b2 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -378,31 +378,31 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
  * informational message
  *
  * TRACE_SYSTEM   7
- * information has system-level scope
+ * information has system-level scope (set of programs)
  *
- * TRACE_PROCESS  8
- * information has process-level scope
+ * TRACE_PROGRAM  8
+ * information has program-level scope (set of processes)
  *
- * TRACE_MODULE   9
- * information has module (executable/library) scope
+ * TRACE_PROCESS  9
+ * information has process-level scope (set of modules)
  *
- * TRACE_UNIT     10
- * information has compilation unit scope
+ * TRACE_MODULE   10
+ * information has module (executable/library) scope (set of units)
  *
- * TRACE_CLASS    11
- * information has class-level scope
+ * TRACE_UNIT     11
+ * information has compilation unit scope (set of functions)
  *
- * TRACE_OBJECT   12
- * information has object-level scope
- *
- * TRACE_FUNCTION 13
+ * TRACE_FUNCTION 12
  * information has function-level scope
  *
- * TRACE_PRINTF   14
- * tracepoint_printf message
+ * TRACE_DEFAULT  13
+ * default trace loglevel (TRACEPOINT_EVENT default)
+ *
+ * TRACE_VERBOSE  14
+ * verbose information
  *
  * TRACE_DEBUG    15
- * debug-level message
+ * debug-level message (trace_printf default)
  *
  * Declare tracepoint loglevels for tracepoints. A TRACEPOINT_EVENT
  * should be declared prior to the the TRACEPOINT_LOGLEVEL for a given
@@ -425,13 +425,13 @@ enum {
        TRACE_NOTICE    = 5,
        TRACE_INFO      = 6,
        TRACE_SYSTEM    = 7,
-       TRACE_PROCESS   = 8,
-       TRACE_MODULE    = 9,
-       TRACE_UNIT      = 10,
-       TRACE_CLASS     = 11,
-       TRACE_OBJECT    = 12,
-       TRACE_FUNCTION  = 13,
-       TRACE_PRINTF    = 14,
+       TRACE_PROGRAM   = 8,
+       TRACE_PROCESS   = 9,
+       TRACE_MODULE    = 10,
+       TRACE_UNIT      = 11,
+       TRACE_FUNCTION  = 12,
+       TRACE_DEFAULT   = 13,
+       TRACE_VERBOSE   = 14,
        TRACE_DEBUG     = 15,
 };
 

diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c
index 056fad06a161bcad2db548a705fc25e2a14c976b..b24cab13f37bcaa8647193e3d3ec0980c8da3b09 100644 (file)
--- a/liblttng-ust/ltt-probes.c
+++ b/liblttng-ust/ltt-probes.c
@@ -13,11 +13,11 @@
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <lttng/ust-events.h>
+#include <lttng/tracepoint.h>
 #include <assert.h>
 #include <helper.h>
 #include <ctype.h>
 
-#include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "jhash.h"
 #include "error.h"

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index fa7907262608a8af5c68b960ef74692f395213df..05f3d5881b49ae1565fe45027719e107577315ac 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -29,10 +29,10 @@
 #include <urcu/list.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
+#include <lttng/tracepoint.h>
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include "ltt-tracer.h"
-#include "tracepoint-internal.h"
 
 static int lttng_ust_abi_close_in_progress;
 

diff --git a/liblttng-ust/tracepoint-internal.h b/liblttng-ust/tracepoint-internal.h
index d736df4a1bd6a759753a75687af69057b73f301d..8ac6487f7b00078db5fa12496991b6d72decde5c 100644 (file)
--- a/liblttng-ust/tracepoint-internal.h
+++ b/liblttng-ust/tracepoint-internal.h
@@ -23,11 +23,6 @@
 #include <urcu-bp.h>
 #include <lttng/tracepoint-types.h>
 
-/*
- * default loglevel.
- */
-#define TRACE_DEFAULT          15
-
 struct tracepoint_lib {
        struct cds_list_head list;
        struct tracepoint * const *tracepoints_start;