graal-jvmci-8: src/share/vm/runtime/sweeper.cpp comparison

comparison src/share/vm/runtime/sweeper.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works

author	Doug Simon <doug.simon@oracle.com>
date	Mon, 12 Nov 2012 23:14:12 +0100
parents	957c266d8bc5 da91efe96a93
children	836a62f43af9

comparison

equal deleted inserted replaced

-:ae13cc658b80
+:e522a00b91aa
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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.
 *
 */
 #include "precompiled.hpp"
 #include "code/codeCache.hpp"
+#include "code/compiledIC.hpp"
+#include "code/icBuffer.hpp"
 #include "code/nmethod.hpp"
 #include "compiler/compileBroker.hpp"
 #include "memory/resourceArea.hpp"
-#include "oops/methodOop.hpp"
+#include "oops/method.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/compilationPolicy.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sweeper.hpp"
 }
 }
 class NMethodMarker: public StackObj {
 private:
+#ifdef GRAAL
 JavaThread* _thread;
+#else
+CompilerThread* _thread;
+#endif
 public:
 NMethodMarker(nmethod* nm) {
+#ifdef GRAAL
 _thread = JavaThread::current();
-_thread->set_scanned_nmethod(nm);
+#else
+_thread = CompilerThread::current();
+#endif
+if (!nm->is_zombie() && !nm->is_unloaded()) {
+// Only expose live nmethods for scanning
+_thread->set_scanned_nmethod(nm);
+}
 }
 ~NMethodMarker() {
 _thread->set_scanned_nmethod(NULL);
 }
 };
+void NMethodSweeper::release_nmethod(nmethod *nm) {
+// Clean up any CompiledICHolders
+{
+ResourceMark rm;
+MutexLocker ml_patch(CompiledIC_lock);
+RelocIterator iter(nm);
+while (iter.next()) {
+if (iter.type() == relocInfo::virtual_call_type) {
+CompiledIC::cleanup_call_site(iter.virtual_call_reloc());
+}
+}
+}
+MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+nm->flush();
+}
 void NMethodSweeper::process_nmethod(nmethod *nm) {
 assert(!CodeCache_lock->owned_by_self(), "just checking");
 // Make sure this nmethod doesn't get unloaded during the scan,
 if (nm->is_marked_for_reclamation()) {
 assert(!nm->is_locked_by_vm(), "must not flush locked nmethods");
 if (PrintMethodFlushing && Verbose) {
 tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (marked for reclamation) being flushed", nm->compile_id(), nm);
 }
-MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+release_nmethod(nm);
-nm->flush();
 } else {
 if (PrintMethodFlushing && Verbose) {
 tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (zombie) being marked for reclamation", nm->compile_id(), nm);
 }
 nm->mark_for_reclamation();
 } else if (nm->is_unloaded()) {
 // Unloaded code, just make it a zombie
 if (PrintMethodFlushing && Verbose)
 tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (unloaded) being made zombie", nm->compile_id(), nm);
 if (nm->is_osr_method()) {
+SWEEP(nm);
 // No inline caches will ever point to osr methods, so we can just remove it
-MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+release_nmethod(nm);
-SWEEP(nm);
-nm->flush();
 } else {
 nm->make_zombie();
 _rescan = true;
 SWEEP(nm);
 }
 // they will call a vm op that comes here. This code attempts to speculatively
 // unload the oldest half of the nmethods (based on the compile job id) by
 // saving the old code in a list in the CodeCache. Then
 // execution resumes. If a method so marked is not called by the second sweeper
 // stack traversal after the current one, the nmethod will be marked non-entrant and
-// got rid of by normal sweeping. If the method is called, the methodOop's
+// got rid of by normal sweeping. If the method is called, the Method*'s
-// _code field is restored and the methodOop/nmethod
+// _code field is restored and the Method*/nmethod
 // go back to their normal state.
 void NMethodSweeper::handle_full_code_cache(bool is_full) {
 // Only the first one to notice can advise us to start early cleaning
 if (!is_full){
 jint old = Atomic::cmpxchg( 1, &_advise_to_sweep, 0 );

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/sweeper.cpp @ 6948:e522a00b91aa