Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | ce248dc0a656 c24f778e9401 |
children | 5fc51c1ecdeb 96a337d307bd |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
70 #include "runtime/javaCalls.hpp" | 70 #include "runtime/javaCalls.hpp" |
71 #include "runtime/jfieldIDWorkaround.hpp" | 71 #include "runtime/jfieldIDWorkaround.hpp" |
72 #include "runtime/reflection.hpp" | 72 #include "runtime/reflection.hpp" |
73 #include "runtime/sharedRuntime.hpp" | 73 #include "runtime/sharedRuntime.hpp" |
74 #include "runtime/signature.hpp" | 74 #include "runtime/signature.hpp" |
75 #include "runtime/thread.inline.hpp" | |
75 #include "runtime/vm_operations.hpp" | 76 #include "runtime/vm_operations.hpp" |
76 #include "services/runtimeService.hpp" | 77 #include "services/runtimeService.hpp" |
77 #include "trace/tracing.hpp" | 78 #include "trace/tracing.hpp" |
78 #include "trace/traceEventTypes.hpp" | 79 #include "trace/traceEventTypes.hpp" |
79 #include "utilities/defaultStream.hpp" | 80 #include "utilities/defaultStream.hpp" |
80 #include "utilities/dtrace.hpp" | 81 #include "utilities/dtrace.hpp" |
81 #include "utilities/events.hpp" | 82 #include "utilities/events.hpp" |
82 #include "utilities/histogram.hpp" | 83 #include "utilities/histogram.hpp" |
83 #ifdef TARGET_OS_FAMILY_linux | 84 #ifdef TARGET_OS_FAMILY_linux |
84 # include "os_linux.inline.hpp" | 85 # include "os_linux.inline.hpp" |
85 # include "thread_linux.inline.hpp" | |
86 #endif | 86 #endif |
87 #ifdef TARGET_OS_FAMILY_solaris | 87 #ifdef TARGET_OS_FAMILY_solaris |
88 # include "os_solaris.inline.hpp" | 88 # include "os_solaris.inline.hpp" |
89 # include "thread_solaris.inline.hpp" | |
90 #endif | 89 #endif |
91 #ifdef TARGET_OS_FAMILY_windows | 90 #ifdef TARGET_OS_FAMILY_windows |
92 # include "os_windows.inline.hpp" | 91 # include "os_windows.inline.hpp" |
93 # include "thread_windows.inline.hpp" | |
94 #endif | 92 #endif |
95 #ifdef TARGET_OS_FAMILY_bsd | 93 #ifdef TARGET_OS_FAMILY_bsd |
96 # include "os_bsd.inline.hpp" | 94 # include "os_bsd.inline.hpp" |
97 # include "thread_bsd.inline.hpp" | |
98 #endif | 95 #endif |
99 | 96 |
100 static jint CurrentVersion = JNI_VERSION_1_6; | 97 static jint CurrentVersion = JNI_VERSION_1_6; |
101 | 98 |
102 | 99 |
5055 | 5052 |
5056 #ifndef PRODUCT | 5053 #ifndef PRODUCT |
5057 | 5054 |
5058 #include "gc_interface/collectedHeap.hpp" | 5055 #include "gc_interface/collectedHeap.hpp" |
5059 #include "utilities/quickSort.hpp" | 5056 #include "utilities/quickSort.hpp" |
5057 #if INCLUDE_VM_STRUCTS | |
5058 #include "runtime/vmStructs.hpp" | |
5059 #endif | |
5060 | 5060 |
5061 #define run_unit_test(unit_test_function_call) \ | 5061 #define run_unit_test(unit_test_function_call) \ |
5062 tty->print_cr("Running test: " #unit_test_function_call); \ | 5062 tty->print_cr("Running test: " #unit_test_function_call); \ |
5063 unit_test_function_call | 5063 unit_test_function_call |
5064 | 5064 |
5067 tty->print_cr("Running internal VM tests"); | 5067 tty->print_cr("Running internal VM tests"); |
5068 run_unit_test(arrayOopDesc::test_max_array_length()); | 5068 run_unit_test(arrayOopDesc::test_max_array_length()); |
5069 run_unit_test(CollectedHeap::test_is_in()); | 5069 run_unit_test(CollectedHeap::test_is_in()); |
5070 run_unit_test(QuickSort::test_quick_sort()); | 5070 run_unit_test(QuickSort::test_quick_sort()); |
5071 run_unit_test(AltHashing::test_alt_hash()); | 5071 run_unit_test(AltHashing::test_alt_hash()); |
5072 #if INCLUDE_VM_STRUCTS | |
5073 run_unit_test(VMStructs::test()); | |
5074 #endif | |
5072 tty->print_cr("All internal VM tests passed"); | 5075 tty->print_cr("All internal VM tests passed"); |
5073 } | 5076 } |
5074 } | 5077 } |
5075 | 5078 |
5076 #undef run_unit_test | 5079 #undef run_unit_test |