Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/thread.cpp @ 14405:438e13354adf
Merge
author | kvn |
---|---|
date | Fri, 19 Jul 2013 13:32:53 -0700 |
parents | 583211d4b16b 71180a6e5080 |
children | 94c202aa2646 |
comparison
equal
deleted
inserted
replaced
14404:6cc7093e1341 | 14405:438e13354adf |
---|---|
43 #include "oops/symbol.hpp" | 43 #include "oops/symbol.hpp" |
44 #include "prims/jvm_misc.hpp" | 44 #include "prims/jvm_misc.hpp" |
45 #include "prims/jvmtiExport.hpp" | 45 #include "prims/jvmtiExport.hpp" |
46 #include "prims/jvmtiThreadState.hpp" | 46 #include "prims/jvmtiThreadState.hpp" |
47 #include "prims/privilegedStack.hpp" | 47 #include "prims/privilegedStack.hpp" |
48 #include "runtime/aprofiler.hpp" | |
49 #include "runtime/arguments.hpp" | 48 #include "runtime/arguments.hpp" |
50 #include "runtime/biasedLocking.hpp" | 49 #include "runtime/biasedLocking.hpp" |
51 #include "runtime/deoptimization.hpp" | 50 #include "runtime/deoptimization.hpp" |
52 #include "runtime/fprofiler.hpp" | 51 #include "runtime/fprofiler.hpp" |
53 #include "runtime/frame.inline.hpp" | 52 #include "runtime/frame.inline.hpp" |
3678 // stack trace if appropriate. Simply exit VM. | 3677 // stack trace if appropriate. Simply exit VM. |
3679 vm_exit(1); | 3678 vm_exit(1); |
3680 } | 3679 } |
3681 | 3680 |
3682 if (Arguments::has_profile()) FlatProfiler::engage(main_thread, true); | 3681 if (Arguments::has_profile()) FlatProfiler::engage(main_thread, true); |
3683 if (Arguments::has_alloc_profile()) AllocationProfiler::engage(); | |
3684 if (MemProfiling) MemProfiler::engage(); | 3682 if (MemProfiling) MemProfiler::engage(); |
3685 StatSampler::engage(); | 3683 StatSampler::engage(); |
3686 if (CheckJNICalls) JniPeriodicChecker::engage(); | 3684 if (CheckJNICalls) JniPeriodicChecker::engage(); |
3687 | 3685 |
3688 BiasedLocking::init(); | 3686 BiasedLocking::init(); |