graal-jvmci-8: src/share/vm/compiler/compileBroker.cpp comparison

comparison src/share/vm/compiler/compileBroker.cpp @ 3619:5e9645341ec3

support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod

author	Lukas Stadler <lukas.stadler@jku.at>
date	Wed, 09 Nov 2011 11:27:38 +0100
parents	22d11b3bc561
children	9c2c0a182f13

comparison

equal deleted inserted replaced

-:3822c5969a8b
+:5e9645341ec3
 CompileQueue* CompileBroker::_c1_method_queue   = NULL;
 CompileTask*  CompileBroker::_task_free_list = NULL;
 GrowableArray<CompilerThread*>* CompileBroker::_method_threads = NULL;
+bool CompileBroker::_poll_java_queue = false;
 CompileTaskWrapper::CompileTaskWrapper(CompileTask* task) {
 CompilerThread* thread = CompilerThread::current();
 thread->set_task(task);
 CompileLog*     log  = thread->log();
 // ------------------------------------------------------------------
 // CompileQueue::get
 //
 // Get the next CompileTask from a CompileQueue
-CompileTask* CompileQueue::get() {
+CompileTask* CompileQueue::get(bool& interrupt) {
 NMethodSweeper::possibly_sweep();
 MutexLocker locker(lock());
 // Wait for an available CompileTask.
 while (_first == NULL) {
+if (interrupt) {
+return NULL;
+}
 // There is no work to be done right now.  Wait.
 if (UseCodeCacheFlushing && (!CompileBroker::should_compile_new_jobs() || CodeCache::needs_flushing())) {
 // During the emergency sweeping periods, wake up and sweep occasionally
 bool timedout = lock()->wait(!Mutex::_no_safepoint_check_flag, NmethodSweepCheckInterval*1000);
 if (timedout) {
 jlong diff = os::javaTimeMillis() - start;
 tty->print_cr("Finished bootstrap in %d ms", diff);
 if (CITime) CompileBroker::print_times();
 tty->print_cr("===========================================================================");
+}
+void CompileBroker::notify_java_queue() {
+HandleMark hm;
+ResourceMark rm;
+_poll_java_queue = true;
+{
+ThreadInVMfromNative tivm(JavaThread::current());
+MutexLocker locker(_c1_method_queue->lock(), Thread::current());
+_c1_method_queue->lock()->notify_all();
+}
 }
 // ------------------------------------------------------------------
 // CompileBroker::compilation_init
 } else if (UseCodeCacheFlushing && CodeCache::needs_flushing()) {
 // Attempt to start cleaning the code cache while there is still a little headroom
 NMethodSweeper::handle_full_code_cache(false);
 }
-CompileTask* task = queue->get();
+CompileTask* task = queue->get(_poll_java_queue);
-// Give compiler threads an extra quanta.  They tend to be bursty and
+if (task != NULL) {
-// this helps the compiler to finish up the job.
+// Give compiler threads an extra quanta.  They tend to be bursty and
-if( CompilerThreadHintNoPreempt )
+// this helps the compiler to finish up the job.
-os::hint_no_preempt();
+if( CompilerThreadHintNoPreempt )
+os::hint_no_preempt();
-// trace per thread time and compile statistics
-CompilerCounters* counters = ((CompilerThread*)thread)->counters();
+// trace per thread time and compile statistics
-PerfTraceTimedEvent(counters->time_counter(), counters->compile_counter());
+CompilerCounters* counters = ((CompilerThread*)thread)->counters();
+PerfTraceTimedEvent(counters->time_counter(), counters->compile_counter());
-// Assign the task to the current thread.  Mark this compilation
-// thread as active for the profiler.
+// Assign the task to the current thread.  Mark this compilation
-CompileTaskWrapper ctw(task);
+// thread as active for the profiler.
-nmethodLocker result_handle;  // (handle for the nmethod produced by this task)
+CompileTaskWrapper ctw(task);
-task->set_code_handle(&result_handle);
+nmethodLocker result_handle;  // (handle for the nmethod produced by this task)
-methodHandle method(thread,
+task->set_code_handle(&result_handle);
-(methodOop)JNIHandles::resolve(task->method_handle()));
+methodHandle method(thread,
+(methodOop)JNIHandles::resolve(task->method_handle()));
-// Never compile a method if breakpoints are present in it
-if (method()->number_of_breakpoints() == 0) {
+// Never compile a method if breakpoints are present in it
-// Compile the method.
+if (method()->number_of_breakpoints() == 0) {
-if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
+// Compile the method.
-#ifdef COMPILER1
+if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
-// Allow repeating compilations for the purpose of benchmarking
+#ifdef COMPILER1
-// compile speed. This is not useful for customers.
+// Allow repeating compilations for the purpose of benchmarking
-if (CompilationRepeat != 0) {
+// compile speed. This is not useful for customers.
-int compile_count = CompilationRepeat;
+if (CompilationRepeat != 0) {
-while (compile_count > 0) {
+int compile_count = CompilationRepeat;
-invoke_compiler_on_method(task);
+while (compile_count > 0) {
-nmethod* nm = method->code();
+invoke_compiler_on_method(task);
-if (nm != NULL) {
+nmethod* nm = method->code();
-nm->make_zombie();
+if (nm != NULL) {
-method->clear_code();
+nm->make_zombie();
+method->clear_code();
+}
+compile_count--;
 }
-compile_count--;
 }
+#endif /* COMPILER1 */
+invoke_compiler_on_method(task);
+} else {
+// After compilation is disabled, remove remaining methods from queue
+method->clear_queued_for_compilation();
 }
-#endif /* COMPILER1 */
+}
-invoke_compiler_on_method(task);
+}
-} else {
-// After compilation is disabled, remove remaining methods from queue
+if (_poll_java_queue) {
-method->clear_queued_for_compilation();
+_poll_java_queue = false;
+if (UseGraal) {
+GraalCompiler::instance()->poll_java_queue();
 }
 }
 }
 }
 }

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/compiler/compileBroker.cpp @ 3619:5e9645341ec3