X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Ftracelog.c;h=65fc87ede57818c21d2af3b87ea7c8f3e133e5d7;hb=c7667bfebfa1d054ad8d54fd98ada3c86184e327;hp=0e42b4b163d6bbdc61bf1556f8e30bb0e9376c99;hpb=0cb03c850dedb8f1e7f11e2e47764aa4d3ba313b;p=lttng-ust.git

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index 0e42b4b1..65fc87ed 100644
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -23,6 +23,7 @@
 #define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
+#include <helper.h>
 
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
@@ -44,24 +45,24 @@
 			goto end; \
 		__tracepoint_cb_lttng_ust_tracelog___##level(file, \
 			line, func, msg, len, \
-			__builtin_return_address(0)); \
+			LTTNG_UST_CALLER_IP()); \
 		free(msg); \
 	end: \
 		va_end(ap); \
 	}
 
-TRACELOG_CB(emerg)
-TRACELOG_CB(alert)
-TRACELOG_CB(crit)
-TRACELOG_CB(err)
-TRACELOG_CB(warning)
-TRACELOG_CB(notice)
-TRACELOG_CB(info)
-TRACELOG_CB(debug_system)
-TRACELOG_CB(debug_program)
-TRACELOG_CB(debug_process)
-TRACELOG_CB(debug_module)
-TRACELOG_CB(debug_unit)
-TRACELOG_CB(debug_function)
-TRACELOG_CB(debug_line)
-TRACELOG_CB(debug)
+TRACELOG_CB(TRACE_EMERG)
+TRACELOG_CB(TRACE_ALERT)
+TRACELOG_CB(TRACE_CRIT)
+TRACELOG_CB(TRACE_ERR)
+TRACELOG_CB(TRACE_WARNING)
+TRACELOG_CB(TRACE_NOTICE)
+TRACELOG_CB(TRACE_INFO)
+TRACELOG_CB(TRACE_DEBUG_SYSTEM)
+TRACELOG_CB(TRACE_DEBUG_PROGRAM)
+TRACELOG_CB(TRACE_DEBUG_PROCESS)
+TRACELOG_CB(TRACE_DEBUG_MODULE)
+TRACELOG_CB(TRACE_DEBUG_UNIT)
+TRACELOG_CB(TRACE_DEBUG_FUNCTION)
+TRACELOG_CB(TRACE_DEBUG_LINE)
+TRACELOG_CB(TRACE_DEBUG)