truffle: src/share/vm/compiler/compileBroker.cpp comparison

comparison src/share/vm/compiler/compileBroker.cpp @ 1339:09ac706c2623

Merge

author	asaha
date	Wed, 24 Mar 2010 17:16:33 -0700
parents	cef333a48af6
children	428a9c451986

comparison

equal deleted inserted replaced

-:f5dd08ad65df
+:09ac706c2623
 /*
-* Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1999-2010 Sun Microsystems, Inc.  All Rights Reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #endif // ndef DTRACE_ENABLED
 bool CompileBroker::_initialized = false;
 volatile bool CompileBroker::_should_block = false;
+volatile jint CompileBroker::_should_compile_new_jobs = run_compilation;
 // The installed compiler(s)
 AbstractCompiler* CompileBroker::_compilers[2];
 // These counters are used for assigning id's to each compilation
 #endif // TIERED
 ) {
 return method_code;
 }
 if (method->is_not_compilable(comp_level)) return NULL;
+nmethod* saved = CodeCache::find_and_remove_saved_code(method());
+if (saved != NULL) {
+method->set_code(method, saved);
+return saved;
+}
 } else {
 // osr compilation
 #ifndef TIERED
 // seems like an assert of dubious value
 assert(comp_level == CompLevel_full_optimization,
 // a lock the compiling thread can not acquire. Prefetch it here.
 if (JvmtiExport::should_post_compiled_method_load()) {
 method->jmethod_id();
 }
+// If the compiler is shut off due to code cache flushing or otherwise,
+// fail out now so blocking compiles dont hang the java thread
+if (!should_compile_new_jobs() || (UseCodeCacheFlushing && CodeCache::needs_flushing())) {
+method->invocation_counter()->decay();
+method->backedge_counter()->decay();
+return NULL;
+}
 // do the compilation
 if (method->is_native()) {
 if (!PreferInterpreterNativeStubs) {
 (void) AdapterHandlerLibrary::create_native_wrapper(method);
 } else {
 // Some compilers may not support the compilation of natives.
 // QQQ this needs some work ought to only record not compilable at
 // the specified level
 if (is_native &&
 (!CICompileNatives || !compiler(comp_level)->supports_native())) {
-method->set_not_compilable();
+method->set_not_compilable_quietly();
 return true;
 }
 bool is_osr = (osr_bci != standard_entry_bci);
 // Some compilers may not support on stack replacement.
 method->is_native() ? "generation of native wrapper" : "compile",
 (method->is_static() ? " static" : ""));
 method->print_short_name(tty);
 tty->cr();
 }
-method->set_not_compilable();
+method->set_not_compilable_quietly();
 }
 return false;
 }
 return id;
 }
 }
 // Method was not in the appropriate compilation range.
-method->set_not_compilable();
+method->set_not_compilable_quietly();
 return 0;
 }
 // ------------------------------------------------------------------
 while (true) {
 {
 // We need this HandleMark to avoid leaking VM handles.
 HandleMark hm(thread);
 if (CodeCache::unallocated_capacity() < CodeCacheMinimumFreeSpace) {
-// The CodeCache is full.  Print out warning and disable compilation.
+// the code cache is really full
-UseInterpreter = true;
+handle_full_code_cache();
-if (UseCompiler || AlwaysCompileLoopMethods ) {
+} else if (UseCodeCacheFlushing && CodeCache::needs_flushing()) {
-if (log != NULL) {
+// Attempt to start cleaning the code cache while there is still a little headroom
-log->begin_elem("code_cache_full");
+NMethodSweeper::handle_full_code_cache(false);
-log->stamp();
-log->end_elem();
-}
-#ifndef PRODUCT
-warning("CodeCache is full. Compiler has been disabled");
-if (CompileTheWorld || ExitOnFullCodeCache) {
-before_exit(thread);
-exit_globals(); // will delete tty
-vm_direct_exit(CompileTheWorld ? 0 : 1);
-}
-#endif
-UseCompiler               = false;
-AlwaysCompileLoopMethods  = false;
-}
 }
 CompileTask* task = queue->get();
 // Give compiler threads an extra quanta.  They tend to be bursty and
 (methodOop)JNIHandles::resolve(task->method_handle()));
 // Never compile a method if breakpoints are present in it
 if (method()->number_of_breakpoints() == 0) {
 // Compile the method.
-if (UseCompiler || AlwaysCompileLoopMethods) {
+if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
 #ifdef COMPILER1
 // Allow repeating compilations for the purpose of benchmarking
 // compile speed. This is not useful for customers.
 if (CompilationRepeat != 0) {
 int compile_count = CompilationRepeat;
 if (compilable == ciEnv::MethodCompilable_never) {
 if (is_osr) {
 method->set_not_osr_compilable();
 } else {
-method->set_not_compilable();
+method->set_not_compilable_quietly();
 }
 } else if (compilable == ciEnv::MethodCompilable_not_at_tier) {
-method->set_not_compilable(task->comp_level());
+method->set_not_compilable_quietly(task->comp_level());
 }
 // Note that the queued_for_compilation bits are cleared without
 // protection of a mutex. [They were set by the requester thread,
 // when adding the task to the complie queue -- at which time the
 vm_exit(0);
 }
 #endif
 }
+// ------------------------------------------------------------------
+// CompileBroker::handle_full_code_cache
+//
+// The CodeCache is full.  Print out warning and disable compilation or
+// try code cache cleaning so compilation can continue later.
+void CompileBroker::handle_full_code_cache() {
+UseInterpreter = true;
+if (UseCompiler || AlwaysCompileLoopMethods ) {
+CompilerThread* thread = CompilerThread::current();
+CompileLog* log = thread->log();
+if (log != NULL) {
+log->begin_elem("code_cache_full");
+log->stamp();
+log->end_elem();
+}
+#ifndef PRODUCT
+warning("CodeCache is full. Compiler has been disabled");
+if (CompileTheWorld || ExitOnFullCodeCache) {
+before_exit(JavaThread::current());
+exit_globals(); // will delete tty
+vm_direct_exit(CompileTheWorld ? 0 : 1);
+}
+#endif
+if (UseCodeCacheFlushing) {
+NMethodSweeper::handle_full_code_cache(true);
+} else {
+UseCompiler               = false;
+AlwaysCompileLoopMethods  = false;
+}
+}
+}
 // ------------------------------------------------------------------
 // CompileBroker::set_last_compile
 //
 // Record this compilation for debugging purposes.
 tty->print_cr("  Total compilation time   : %6.3f s", CompileBroker::_t_total_compilation.seconds());
 tty->print_cr("    Standard compilation   : %6.3f s, Average : %2.3f",
 CompileBroker::_t_standard_compilation.seconds(),
 CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
 tty->print_cr("    On stack replacement   : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
-compiler(CompLevel_fast_compile)->print_timers();
-if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier)) {
+if (compiler(CompLevel_fast_compile)) {
-compiler(CompLevel_highest_tier)->print_timers();
+compiler(CompLevel_fast_compile)->print_timers();
+if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier))
+compiler(CompLevel_highest_tier)->print_timers();
 }
 tty->cr();
 int tcb = CompileBroker::_sum_osr_bytes_compiled + CompileBroker::_sum_standard_bytes_compiled;
 tty->print_cr("  Total compiled bytecodes : %6d bytes", tcb);

Mercurial > hg > truffle

comparison src/share/vm/compiler/compileBroker.cpp @ 1339:09ac706c2623