From 38f24d5cd982084f488f6e09d7d007e98fe1e20c Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 9 Mar 2006 20:33:57 +0000
Subject: [PATCH] new ltt-usertrace

git-svn-id: http://ltt.polymtl.ca/svn@1641 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt-usertrace/ltt-facility-loader-user_generic.c |  2 +-
 ltt-usertrace/ltt-facility-loader-user_generic.h |  2 +-
 ltt-usertrace/ltt/ltt-facility-id-user_generic.h |  2 +-
 ltt-usertrace/ltt/ltt-facility-user_generic.h    |  2 +-
 ltt-usertrace/ltt/ltt-usertrace-fast.h           |  4 ++--
 ltt-usertrace/ltt/ltt-usertrace.h                | 14 +++++++++-----
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ltt-usertrace/ltt-facility-loader-user_generic.c b/ltt-usertrace/ltt-facility-loader-user_generic.c
index 8cdb0760..8314ef82 100644
--- a/ltt-usertrace/ltt-facility-loader-user_generic.c
+++ b/ltt-usertrace/ltt-facility-loader-user_generic.c
@@ -12,7 +12,7 @@
 #define LTT_TRACE
 #include <error.h>
 #include <stdio.h>
-#include <ltt/ltt-generic.h>
+#include <ltt/ltt-usertrace.h>
 #include "ltt-facility-loader-user_generic.h"
 
 static struct user_facility_info facility = {
diff --git a/ltt-usertrace/ltt-facility-loader-user_generic.h b/ltt-usertrace/ltt-facility-loader-user_generic.h
index 1f93d1e3..e3373f6f 100644
--- a/ltt-usertrace/ltt-facility-loader-user_generic.h
+++ b/ltt-usertrace/ltt-facility-loader-user_generic.h
@@ -1,7 +1,7 @@
 #ifndef _LTT_FACILITY_LOADER_USER_GENERIC_H_
 #define _LTT_FACILITY_LOADER_USER_GENERIC_H_
 
-#include <ltt/ltt-generic.h>
+#include <ltt/ltt-usertrace.h>
 #include <ltt/ltt-facility-id-user_generic.h>
 
 ltt_facility_t	ltt_facility_user_generic;
diff --git a/ltt-usertrace/ltt/ltt-facility-id-user_generic.h b/ltt-usertrace/ltt/ltt-facility-id-user_generic.h
index 87205eb3..03b10502 100644
--- a/ltt-usertrace/ltt/ltt-facility-id-user_generic.h
+++ b/ltt-usertrace/ltt/ltt-facility-id-user_generic.h
@@ -2,7 +2,7 @@
 #define _LTT_FACILITY_ID_USER_GENERIC_H_
 
 #ifdef LTT_TRACE
-#include <ltt/ltt-generic.h>
+#include <ltt/ltt-usertrace.h>
 
 /****  facility handle  ****/
 
diff --git a/ltt-usertrace/ltt/ltt-facility-user_generic.h b/ltt-usertrace/ltt/ltt-facility-user_generic.h
index 94a636dc..72bac219 100644
--- a/ltt-usertrace/ltt/ltt-facility-user_generic.h
+++ b/ltt-usertrace/ltt/ltt-facility-user_generic.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <ltt/ltt-facility-id-user_generic.h>
-#include <ltt/ltt-generic.h>
+#include <ltt/ltt-usertrace.h>
 
 /* Named types */
 
diff --git a/ltt-usertrace/ltt/ltt-usertrace-fast.h b/ltt-usertrace/ltt/ltt-usertrace-fast.h
index 45b8b6c0..4d7c56ba 100644
--- a/ltt-usertrace/ltt/ltt-usertrace-fast.h
+++ b/ltt-usertrace/ltt/ltt-usertrace-fast.h
@@ -9,6 +9,7 @@
 #define _LTT_USERTRACE_FAST_H
 
 #ifdef LTT_TRACE
+#ifdef LTT_TRACE_FAST
 
 #include <errno.h>
 #include <asm/atomic.h>
@@ -628,7 +629,6 @@ static inline void __attribute__((no_instrument_function)) ltt_commit_slot(
 }
 	
 
+#endif //LTT_TRACE_FAST
 #endif //LTT_TRACE
-
-
 #endif //_LTT_USERTRACE_FAST_H
diff --git a/ltt-usertrace/ltt/ltt-usertrace.h b/ltt-usertrace/ltt/ltt-usertrace.h
index 9d52ad70..dbd48c34 100644
--- a/ltt-usertrace/ltt/ltt-usertrace.h
+++ b/ltt-usertrace/ltt/ltt-usertrace.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
- * ltt-generic.h
+ * ltt-usertrace.h
  *
- * LTT generic userspace tracing header
+ * LTT userspace tracing header
  *
  * Mathieu Desnoyers, March 2006
  */
 
-#ifndef _LTT_GENERIC_H
-#define _LTT_GENERIC_H
+#ifndef _LTT_USERTRACE_H
+#define _LTT_USERTRACE_H
 
 #include <errno.h>
 #include <syscall.h>
@@ -17,6 +17,10 @@
 #include <sys/types.h>
 #include <stdint.h>
 
+#ifdef LTT_TRACE_FAST
+#include <ltt/ltt-usertrace-fast.h>
+#endif //LTT_TRACE_FAST
+
 #ifndef min
 #define min(a,b) ((a)<(b)?(a):(b))
 #endif
@@ -85,6 +89,6 @@ static inline unsigned int __attribute__((no_instrument_function))
 #define LTT_ALIGN __attribute__((packed))
 #endif //LTT_PACK
 
-#endif //_LTT_GENERIC_H
+#endif //_LTT_USERTRACE_H
 
 
-- 
2.34.1