X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fserialize.c;h=f2c5df03b09d2513f538dfc21f633451341b41a5;hb=8161463975e218e0833d31ab1577a7ceb9e8e9f3;hp=8aa3f4b73fac66330c139e6572dd1bfb407b728d;hpb=0222e1213f196b66cbc08cd29093aca4a28e9ffb;p=ust.git

diff --git a/libust/serialize.c b/libust/serialize.c
index 8aa3f4b..f2c5df0 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -25,6 +25,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <stdarg.h>
@@ -32,7 +33,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 #include <urcu/rculist.h>
 
@@ -40,7 +40,7 @@
 #include <ust/clock.h>
 #include "buffers.h"
 #include "tracer.h"
-#include "usterr.h"
+#include "usterr_signal_safe.h"
 #include "ust_snprintf.h"
 
 /*
@@ -624,12 +624,12 @@ void ltt_write_event_data(struct ust_buffer *buf, size_t buf_offset,
 }
 
 
-notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
-			struct registers *regs, void *call_data,
+notrace void ltt_vtrace(const struct ust_marker *mdata, void *probe_data,
+			void *call_data,
 			const char *fmt, va_list *args)
 {
 	int largest_align, ret;
-	struct ltt_active_marker *pdata;
+	struct ltt_active_ust_marker *pdata;
 	uint16_t eID;
 	size_t data_size, slot_size;
 	unsigned int chan_index;
@@ -661,7 +661,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 	stack_pos_ctx = tracer_stack_pos;
 	cmm_barrier();
 
-	pdata = (struct ltt_active_marker *)probe_data;
+	pdata = (struct ltt_active_ust_marker *)probe_data;
 	eID = mdata->event_id;
 	chan_index = mdata->channel_id;
 	closure.callbacks = pdata->probe->callbacks;
@@ -752,14 +752,14 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 	rcu_read_unlock(); //ust// rcu_read_unlock_sched_notrace();
 }
 
-notrace void ltt_trace(const struct marker *mdata, void *probe_data,
-		       struct registers *regs, void *call_data,
+notrace void ltt_trace(const struct ust_marker *mdata, void *probe_data,
+		       void *call_data,
 		       const char *fmt, ...)
 {
 	va_list args;
 
 	va_start(args, fmt);
-	ltt_vtrace(mdata, probe_data, regs, call_data, fmt, &args);
+	ltt_vtrace(mdata, probe_data, call_data, fmt, &args);
 	va_end(args);
 }