[llvm-commits] [compiler-rt] r170892 - in /compiler-rt/trunk/lib/tsan/lit_tests: java.h java_lock.cc java_lock_move.cc java_race.cc

[Dmitry Vyukov]

Author: dvyukov
Date: Fri Dec 21 07:26:10 2012
New Revision: 170892

URL: http://llvm.org/viewvc/llvm-project?rev=170892&view=rev
Log:
tsan: move common part of java tests into a separate header

Added:
    compiler-rt/trunk/lib/tsan/lit_tests/java.h
Modified:
    compiler-rt/trunk/lib/tsan/lit_tests/java_lock.cc
    compiler-rt/trunk/lib/tsan/lit_tests/java_lock_move.cc
    compiler-rt/trunk/lib/tsan/lit_tests/java_race.cc

Added: compiler-rt/trunk/lib/tsan/lit_tests/java.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/java.h?rev=170892&view=auto
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/java.h (added)
+++ compiler-rt/trunk/lib/tsan/lit_tests/java.h Fri Dec 21 07:26:10 2012
@@ -0,0 +1,17 @@
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+extern "C" {
+typedef unsigned long jptr;  // NOLINT
+void __tsan_java_init(jptr heap_begin, jptr heap_size);
+int  __tsan_java_fini();
+void __tsan_java_alloc(jptr ptr, jptr size);
+void __tsan_java_free(jptr ptr, jptr size);
+void __tsan_java_move(jptr src, jptr dst, jptr size);
+void __tsan_java_mutex_lock(jptr addr);
+void __tsan_java_mutex_unlock(jptr addr);
+void __tsan_java_mutex_read_lock(jptr addr);
+void __tsan_java_mutex_read_unlock(jptr addr);
+}

Modified: compiler-rt/trunk/lib/tsan/lit_tests/java_lock.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/java_lock.cc?rev=170892&r1=170891&r2=170892&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/java_lock.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/java_lock.cc Fri Dec 21 07:26:10 2012
@@ -1,19 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdlib.h>
-
-extern "C" {
-typedef unsigned long jptr;  // NOLINT
-void __tsan_java_init(jptr heap_begin, jptr heap_size);
-int  __tsan_java_fini();
-void __tsan_java_alloc(jptr ptr, jptr size);
-void __tsan_java_free(jptr ptr, jptr size);
-void __tsan_java_move(jptr src, jptr dst, jptr size);
-void __tsan_java_mutex_lock(jptr addr);
-void __tsan_java_mutex_unlock(jptr addr);
-void __tsan_java_mutex_read_lock(jptr addr);
-void __tsan_java_mutex_read_unlock(jptr addr);
-}
+#include "java.h"
 
 jptr varaddr;
 jptr lockaddr;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/java_lock_move.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/java_lock_move.cc?rev=170892&r1=170891&r2=170892&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/java_lock_move.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/java_lock_move.cc Fri Dec 21 07:26:10 2012
@@ -1,20 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" {
-typedef unsigned long jptr;  // NOLINT
-void __tsan_java_init(jptr heap_begin, jptr heap_size);
-int  __tsan_java_fini();
-void __tsan_java_alloc(jptr ptr, jptr size);
-void __tsan_java_free(jptr ptr, jptr size);
-void __tsan_java_move(jptr src, jptr dst, jptr size);
-void __tsan_java_mutex_lock(jptr addr);
-void __tsan_java_mutex_unlock(jptr addr);
-void __tsan_java_mutex_read_lock(jptr addr);
-void __tsan_java_mutex_read_unlock(jptr addr);
-}
+#include "java.h"
 
 jptr varaddr;
 jptr lockaddr;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/java_race.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/java_race.cc?rev=170892&r1=170891&r2=170892&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/java_race.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/java_race.cc Fri Dec 21 07:26:10 2012
@@ -1,19 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdlib.h>
-
-extern "C" {
-typedef unsigned long jptr;  // NOLINT
-void __tsan_java_init(jptr heap_begin, jptr heap_size);
-int  __tsan_java_fini();
-void __tsan_java_alloc(jptr ptr, jptr size);
-void __tsan_java_free(jptr ptr, jptr size);
-void __tsan_java_move(jptr src, jptr dst, jptr size);
-void __tsan_java_mutex_lock(jptr addr);
-void __tsan_java_mutex_unlock(jptr addr);
-void __tsan_java_mutex_read_lock(jptr addr);
-void __tsan_java_mutex_read_unlock(jptr addr);
-}
+#include "java.h"
 
 void *Thread(void *p) {
   *(int*)p = 42;