X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fserialize.c;h=8aa3f4b73fac66330c139e6572dd1bfb407b728d;hb=8d6300d3b3cb0219e1109e931a2219dbd812b24d;hp=95b6e897babeff40b815444710af1646bc77d838;hpb=bb3132c8c50b09bd3ca54dc88f9ddb3c0847ba41;p=ust.git

diff --git a/libust/serialize.c b/libust/serialize.c
index 95b6e89..8aa3f4b 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -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;
 		}
@@ -636,7 +636,6 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 	struct ust_channel *channel;
 	struct ust_trace *trace, *dest_trace = NULL;
 	struct ust_buffer *buf;
-	void *transport_data;
 	u64 tsc;
 	long buf_offset;
 	va_list args_copy;
@@ -658,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;
@@ -686,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.
@@ -746,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();
 }