update

git-svn-id: http://ltt.polymtl.ca/svn@2861 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/markers-test/test-mark-speed-edit.c b/markers-test/test-mark-speed-edit.c
index d292e0a6d4096612c505a96252a387a0ebc00c68..7f6d033469044b3d8280f4cd2dbab9c78bac6147 100644 (file)
--- a/markers-test/test-mark-speed-edit.c
+++ b/markers-test/test-mark-speed-edit.c
@@ -73,7 +73,9 @@ static inline void test(unsigned long arg, unsigned long arg2)
        temp = (temp + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
+       barrier();
        test2(NULL, NULL, 2, current->pid, arg, arg2);
+       barrier();
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
 }
 

diff --git a/markers-test/test-mark-speed-empty.c b/markers-test/test-mark-speed-empty.c
index 5a461c47a98c04a3924c8487284dc7197908b459..0496deedd1f6f31e108e1ca4c30ea6607fbd56be 100644 (file)
--- a/markers-test/test-mark-speed-empty.c
+++ b/markers-test/test-mark-speed-empty.c
@@ -61,7 +61,9 @@ static inline void test(unsigned long arg, unsigned long arg2)
        wbinvd();
 #endif
        temp = (temp + 60) << 10;
+       barrier();
        asm volatile ("");
+       barrier();
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
 }

diff --git a/markers-test/test-mark-speed-local.c b/markers-test/test-mark-speed-local.c
index 604e123131f204800583829fcd50e9f6ffacf235..71cd6b6fc0d0c6a39a31351e8ebb0b5cd4c37713 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -72,7 +72,9 @@ static inline void test(unsigned long arg, unsigned long arg2)
        temp = (temp + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
+       barrier();
        test2(NULL, NULL, 2, 10, arg, arg2);
+       barrier();      // make sure the compiler does not optimize marker conditions away!
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
 }
 

diff --git a/markers-test/test-mark-speed-opt.c b/markers-test/test-mark-speed-opt.c
index d36d18bc21f1d6bb5066bb5a2fddfba001453402..a541b51a3022f9f641ecdc2d11c258bd293c3fab 100644 (file)
--- a/markers-test/test-mark-speed-opt.c
+++ b/markers-test/test-mark-speed-opt.c
@@ -62,7 +62,9 @@ static inline void test(unsigned long arg, unsigned long arg2)
        temp = (temp + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
+       barrier();
        __my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
+       barrier();
 }
 
 static int my_open(struct inode *inode, struct file *file)

diff --git a/markers-test/test-mark-speed.c b/markers-test/test-mark-speed.c
index 7509f3cec6026187beb5171451fea3c0b5fb0004..2c585b607acf954ccc911ff7c7e1cb8885a280be 100644 (file)
--- a/markers-test/test-mark-speed.c
+++ b/markers-test/test-mark-speed.c
@@ -62,7 +62,9 @@ static inline void test(unsigned long arg, unsigned long arg2)
 #endif
        temp = (temp + 60) << 10;
        //asm volatile ("");
+       barrier();
        __my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
+       barrier();
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
 }