update

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

diff --git a/markers-test/test-mark-speed-edit.c b/markers-test/test-mark-speed-edit.c
index 3c763e582b34195bf24ba0edd63cf6e0fb69a460..d7c70feb5d0cfc3c48f16c84817d7c88a424b35d 100644 (file)
--- a/markers-test/test-mark-speed-edit.c
+++ b/markers-test/test-mark-speed-edit.c
@@ -63,15 +63,18 @@ static void noinline test2(const struct marker *mdata,
 struct proc_dir_entry *pentry = NULL;
 
 char temp0[8192];
-int temp __cacheline_aligned = 10;
-char temp2[8192];
+int temp[8192];
+char temp5[8192];
 
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = (temp + 60) << 10;
+       temp[2] = (temp[0] + 60) << 10;
+       temp[3] = (temp[2] + 60) << 10;
+       temp[4] = (temp[3] + 60) << 10;
+       temp[0] = (temp[4] + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        barrier();

diff --git a/markers-test/test-mark-speed-empty.c b/markers-test/test-mark-speed-empty.c
index 296ba88cef482925d94f9a23452fa218810981b7..eecef2178e840ff8f432836cf625cba988dbebbd 100644 (file)
--- a/markers-test/test-mark-speed-empty.c
+++ b/markers-test/test-mark-speed-empty.c
@@ -53,15 +53,18 @@ static void noinline test2(const struct marker *mdata,
 struct proc_dir_entry *pentry = NULL;
 
 char temp0[8192];
-int temp __cacheline_aligned = 10;
-char temp2[8192];
+int temp[8192];
+char temp5[8192];
 
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = (temp + 60) << 10;
+       temp[2] = (temp[0] + 60) << 10;
+       temp[3] = (temp[2] + 60) << 10;
+       temp[4] = (temp[3] + 60) << 10;
+       temp[0] = (temp[4] + 60) << 10;
        barrier();
        asm ("");
        barrier();

diff --git a/markers-test/test-mark-speed-local.c b/markers-test/test-mark-speed-local.c
index de219ccbf2dc2879161d0c21ed30c6af4a79690f..295a4abe00e9f76490ccf11e40242821615e0883 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -62,15 +62,18 @@ static void noinline test2(const struct marker *mdata,
 struct proc_dir_entry *pentry = NULL;
 
 char temp0[8192];
-int temp __cacheline_aligned = 10;
-char temp2[8192];
+int temp[8192];
+char temp5[8192];
 
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = (temp + 60) << 10;
+       temp[2] = (temp[0] + 60) << 10;
+       temp[3] = (temp[2] + 60) << 10;
+       temp[4] = (temp[3] + 60) << 10;
+       temp[0] = (temp[4] + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        barrier();

diff --git a/markers-test/test-mark-speed-opt.c b/markers-test/test-mark-speed-opt.c
index 884d5554af497bce4d3d1427a6f8a7bf9e55b2dd..0850b04c428dff13689c90cb35c4819a3552740b 100644 (file)
--- a/markers-test/test-mark-speed-opt.c
+++ b/markers-test/test-mark-speed-opt.c
@@ -52,15 +52,18 @@ static void noinline test2(const struct marker *mdata,
 struct proc_dir_entry *pentry = NULL;
 
 char temp0[8192];
-int temp __cacheline_aligned = 10;
-char temp2[8192];
+int temp[8192];
+char temp5[8192];
 
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = (temp + 60) << 10;
+       temp[2] = (temp[0] + 60) << 10;
+       temp[3] = (temp[2] + 60) << 10;
+       temp[4] = (temp[3] + 60) << 10;
+       temp[0] = (temp[4] + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        barrier();

diff --git a/markers-test/test-mark-speed.c b/markers-test/test-mark-speed.c
index dcea38e0f5fd1b9f8dc396db79d4ae33f37da659..00ca62c177877a9de8fb5f42cf7c5336a769be51 100644 (file)
--- a/markers-test/test-mark-speed.c
+++ b/markers-test/test-mark-speed.c
@@ -53,15 +53,18 @@ static void noinline test2(const struct marker *mdata,
 struct proc_dir_entry *pentry = NULL;
 
 char temp0[8192];
-int temp __cacheline_aligned = 10;
-char temp2[8192];
+int temp[8192];
+char temp5[8192];
 
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = (temp + 60) << 10;
+       temp[2] = (temp[0] + 60) << 10;
+       temp[3] = (temp[2] + 60) << 10;
+       temp[4] = (temp[3] + 60) << 10;
+       temp[0] = (temp[4] + 60) << 10;
        //asm volatile ("");
        barrier();
        __my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);