comparison src/share/vm/runtime/java.cpp @ 4562:ef00461e29af

Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Fri, 10 Feb 2012 10:16:19 -0800
parents 35ca3ade314d 723df37192d6
children 33df1aeaebbf
comparison
equal deleted inserted replaced
4561:35ca3ade314d 4562:ef00461e29af
28 #include "classfile/systemDictionary.hpp" 28 #include "classfile/systemDictionary.hpp"
29 #include "code/codeCache.hpp" 29 #include "code/codeCache.hpp"
30 #include "compiler/compileBroker.hpp" 30 #include "compiler/compileBroker.hpp"
31 #include "compiler/compilerOracle.hpp" 31 #include "compiler/compilerOracle.hpp"
32 #include "interpreter/bytecodeHistogram.hpp" 32 #include "interpreter/bytecodeHistogram.hpp"
33 #ifdef GRAAL
33 #include "graal/graalCompiler.hpp" 34 #include "graal/graalCompiler.hpp"
35 #endif
34 #include "memory/genCollectedHeap.hpp" 36 #include "memory/genCollectedHeap.hpp"
35 #include "memory/oopFactory.hpp" 37 #include "memory/oopFactory.hpp"
36 #include "memory/universe.hpp" 38 #include "memory/universe.hpp"
37 #include "oops/constantPoolOop.hpp" 39 #include "oops/constantPoolOop.hpp"
38 #include "oops/generateOopMap.hpp" 40 #include "oops/generateOopMap.hpp"
430 #define BEFORE_EXIT_RUNNING 1 432 #define BEFORE_EXIT_RUNNING 1
431 #define BEFORE_EXIT_DONE 2 433 #define BEFORE_EXIT_DONE 2
432 static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN; 434 static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN;
433 435
434 #ifdef GRAAL 436 #ifdef GRAAL
435 if (UseGraal) { 437 GraalCompiler::instance()->exit();
436 GraalCompiler::instance()->exit();
437 }
438 #endif 438 #endif
439 439
440 // Note: don't use a Mutex to guard the entire before_exit(), as 440 // Note: don't use a Mutex to guard the entire before_exit(), as
441 // JVMTI post_thread_end_event and post_vm_death_event will run native code. 441 // JVMTI post_thread_end_event and post_vm_death_event will run native code.
442 // A CAS or OSMutex would work just fine but then we need to manipulate 442 // A CAS or OSMutex would work just fine but then we need to manipulate