comparison src/share/vm/runtime/java.cpp @ 4559:723df37192d6

Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 3c21eee8ab4d
children ef00461e29af
comparison
equal deleted inserted replaced
4558:3706975946e4 4559:723df37192d6
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"
424 #define BEFORE_EXIT_RUNNING 1 426 #define BEFORE_EXIT_RUNNING 1
425 #define BEFORE_EXIT_DONE 2 427 #define BEFORE_EXIT_DONE 2
426 static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN; 428 static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN;
427 429
428 #ifdef GRAAL 430 #ifdef GRAAL
429 if (UseGraal) { 431 GraalCompiler::instance()->exit();
430 GraalCompiler::instance()->exit();
431 }
432 #endif 432 #endif
433 433
434 // Note: don't use a Mutex to guard the entire before_exit(), as 434 // Note: don't use a Mutex to guard the entire before_exit(), as
435 // JVMTI post_thread_end_event and post_vm_death_event will run native code. 435 // JVMTI post_thread_end_event and post_vm_death_event will run native code.
436 // A CAS or OSMutex would work just fine but then we need to manipulate 436 // A CAS or OSMutex would work just fine but then we need to manipulate