From 902e13794ab77170a59123c3c62c5d6204941756 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 2 Feb 2012 10:07:34 -0500
Subject: [PATCH] Update loglevel names

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/lttng/tracepoint.h         | 46 +++++++++++++++---------------
 liblttng-ust/ltt-probes.c          |  2 +-
 liblttng-ust/lttng-ust-abi.c       |  2 +-
 liblttng-ust/tracepoint-internal.h |  5 ----
 4 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 52513d12..fa39b272 100644
--- 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 056fad06..b24cab13 100644
--- 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 fa790726..05f3d588 100644
--- 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 d736df4a..8ac6487f 100644
--- 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;
-- 
2.34.1