X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=libust%2Fserialize.c;h=c637786ed9563cde1a63f22e0f88ff9d30abbc6c;hb=30ffe2794fc413035208cdd2a7a061bc208e210f;hp=bd947ab1f90d9cd1358bae1538d0f80de2429e62;hpb=5f9aacae75a4181a54bf16f31ce8e18229dddc60;p=ust.git

diff --git a/libust/serialize.c b/libust/serialize.c
index bd947ab..c637786 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -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"
 
 /*
@@ -429,7 +429,7 @@ static inline size_t serialize_trace_data(struct ust_buffer *buf,
 			 */
 			tracer_stack_pos++;
 			assert(tracer_stack_pos <= TRACER_STACK_LEN);
-			barrier();
+			cmm_barrier();
 			tracer_stack[*stack_pos_ctx] =
 					strlen(tmp.v_string.s) + 1;
 		}
@@ -657,9 +657,9 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 	cpu = ust_get_cpu();
 
 	/* Force volatile access. */
-	STORE_SHARED(ltt_nesting, LOAD_SHARED(ltt_nesting) + 1);
+	CMM_STORE_SHARED(ltt_nesting, CMM_LOAD_SHARED(ltt_nesting) + 1);
 	stack_pos_ctx = tracer_stack_pos;
-	barrier();
+	cmm_barrier();
 
 	pdata = (struct ltt_active_marker *)probe_data;
 	eID = mdata->event_id;
@@ -685,7 +685,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 	va_end(args_copy);
 
 	/* Iterate on each trace */
-	list_for_each_entry_rcu(trace, &ltt_traces.head, list) {
+	cds_list_for_each_entry_rcu(trace, &ltt_traces.head, list) {
 		/*
 		 * Expect the filter to filter out events. If we get here,
 		 * we went through tracepoint activation as a first step.
@@ -745,9 +745,9 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 		DBG("just commited event (%s/%s) at offset %ld and size %zd", mdata->channel, mdata->name, buf_offset, slot_size);
 	}
 
-	barrier();
+	cmm_barrier();
 	tracer_stack_pos = stack_pos_ctx;
-	STORE_SHARED(ltt_nesting, LOAD_SHARED(ltt_nesting) - 1);
+	CMM_STORE_SHARED(ltt_nesting, CMM_LOAD_SHARED(ltt_nesting) - 1);
 
 	rcu_read_unlock(); //ust// rcu_read_unlock_sched_notrace();
 }