libust: New transport mutex v2

[ust.git] / libust / tracercore.c

diff --git a/libust/tracercore.c b/libust/tracercore.c
index 51f9a70877b07143692501b90cc01053a5867cf2..1e418b6a97d6be33f7d6379c82b72e69119f420e 100644 (file)
--- a/libust/tracercore.c
+++ b/libust/tracercore.c
@@ -18,13 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/kernelcompat.h>
 #include "tracercore.h"
 
 /* Traces structures */
 struct ltt_traces ltt_traces = {
-       .setup_head = LIST_HEAD_INIT(ltt_traces.setup_head),
-       .head = LIST_HEAD_INIT(ltt_traces.head),
+       .setup_head = CDS_LIST_HEAD_INIT(ltt_traces.setup_head),
+       .head = CDS_LIST_HEAD_INIT(ltt_traces.head),
 };
 
 /* Traces list writer locking */
@@ -32,17 +31,17 @@ static DEFINE_MUTEX(ltt_traces_mutex);
 
 void ltt_lock_traces(void)
 {
-       mutex_lock(&ltt_traces_mutex);
+       pthread_mutex_lock(&ltt_traces_mutex);
 }
 
 void ltt_unlock_traces(void)
 {
-       mutex_unlock(&ltt_traces_mutex);
+       pthread_mutex_unlock(&ltt_traces_mutex);
 }
 
 //ust// DEFINE_PER_CPU(unsigned int, ltt_nesting);
 //ust// EXPORT_PER_CPU_SYMBOL(ltt_nesting);
-unsigned int ltt_nesting;
+__thread int ltt_nesting;
 
 int ltt_run_filter_default(void *trace, uint16_t eID)
 {