X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Ftracercore.h;h=9673cca2a875cf6bf44e86fb4681957c04828948;hb=HEAD;hp=5a088db65e4e2c5c4e81ec91ecb640da7897aed5;hpb=aa08b4413291fabcbd1b1144377d37034ad361de;p=ust.git

diff --git a/libust/tracercore.h b/libust/tracercore.h
index 5a088db..9673cca 100644
--- a/libust/tracercore.h
+++ b/libust/tracercore.h
@@ -18,14 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef LTT_CORE_H
-#define LTT_CORE_H
+#ifndef UST_TRACERCORE_H
+#define UST_TRACERCORE_H
 
-#include <ust/kernelcompat.h>
-//ust// #include <linux/percpu.h>
-
-/* ltt's root dir in debugfs */
-#define LTT_ROOT        "ltt"
+#include <ust/kcompat/kcompat.h>
+#include <ust/core.h>
+#include <urcu/list.h>
 
 /*
  * All modifications of ltt_traces must be done by ltt-tracer.c, while holding
@@ -34,21 +32,15 @@
  * list.
  */
 struct ltt_traces {
-	struct list_head setup_head;	/* Pre-allocated traces list */
-	struct list_head head;		/* Allocated Traces list */
+	struct cds_list_head setup_head;	/* Pre-allocated traces list */
+	struct cds_list_head head;		/* Allocated Traces list */
 	unsigned int num_active_traces;	/* Number of active traces */
 } ____cacheline_aligned;
 
 extern struct ltt_traces ltt_traces;
 
-/*
- * get dentry of ltt's root dir
- */
-struct dentry *get_ltt_root(void);
-
 /* Keep track of trap nesting inside LTT */
-//ust// DECLARE_PER_CPU(unsigned int, ltt_nesting);
-extern unsigned int ltt_nesting;
+extern __thread int ltt_nesting;
 
 typedef int (*ltt_run_filter_functor)(void *trace, uint16_t eID);
 //typedef int (*ltt_run_filter_functor)(void *, __u16);
@@ -58,39 +50,4 @@ extern ltt_run_filter_functor ltt_run_filter;
 extern void ltt_filter_register(ltt_run_filter_functor func);
 extern void ltt_filter_unregister(void);
 
-#if defined(CONFIG_LTT) && defined(CONFIG_LTT_ALIGNMENT)
-
-/*
- * Calculate the offset needed to align the type.
- * size_of_type must be non-zero.
- */
-static inline unsigned int ltt_align(size_t align_drift, size_t size_of_type)
-{
-	size_t alignment = min(sizeof(void *), size_of_type);
-	return (alignment - align_drift) & (alignment - 1);
-}
-/* Default arch alignment */
-#define LTT_ALIGN
-
-static inline int ltt_get_alignment(void)
-{
-	return sizeof(void *);
-}
-
-#else
-
-static inline unsigned int ltt_align(size_t align_drift,
-		 size_t size_of_type)
-{
-	return 0;
-}
-
-#define LTT_ALIGN __attribute__((packed))
-
-static inline int ltt_get_alignment(void)
-{
-	return 0;
-}
-#endif /* defined(CONFIG_LTT) && defined(CONFIG_LTT_ALIGNMENT) */
-
-#endif /* LTT_CORE_H */
+#endif /* UST_TRACERCORE_H */