truffle: src/share/vm/runtime/thread.cpp comparison

comparison src/share/vm/runtime/thread.cpp @ 997:46b819ba120b

Merge

author	jrose
date	Wed, 30 Sep 2009 13:25:39 -0700
parents	87770dcf831b 148e5441d916
children	39b01ab7035a

comparison

equal deleted inserted replaced

-:1af62b6ca0f9
+:46b819ba120b
 assert(SharedHeap::heap()->n_par_threads() > 0,
 "Should only fail when parallel.");
 return false;
 }
-void Thread::oops_do(OopClosure* f) {
+void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
 active_handles()->oops_do(f);
 // Do oop for ThreadShadow
 f->do_oop((oop*)&_pending_exception);
 handle_area()->oops_do(f);
 }
-void Thread::nmethods_do() {
+void Thread::nmethods_do(CodeBlobClosure* cf) {
+// no nmethods in a generic thread...
 }
 void Thread::print_on(outputStream* st) const {
 // get_priority assumes osthread initialized
 if (osthread() != NULL) {
 void JavaThread::gc_prologue() {
 frames_do(frame_gc_prologue);
 }
-void JavaThread::oops_do(OopClosure* f) {
+void JavaThread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
 // The ThreadProfiler oops_do is done from FlatProfiler::oops_do
 // since there may be more than one thread using each ThreadProfiler.
 // Traverse the GCHandles
-Thread::oops_do(f);
+Thread::oops_do(f, cf);
 assert( (!has_last_Java_frame() && java_call_counter() == 0) ||
 (has_last_Java_frame() && java_call_counter() > 0), "wrong java_sp info!");
 if (has_last_Java_frame()) {
 chunk->oops_do(f);
 }
 // Traverse the execution stack
 for(StackFrameStream fst(this); !fst.is_done(); fst.next()) {
-fst.current()->oops_do(f, fst.register_map());
+fst.current()->oops_do(f, cf, fst.register_map());
 }
 }
 // callee_target is never live across a gc point so NULL it here should
 // it still contain a methdOop.
 if (jvmti_thread_state() != NULL) {
 jvmti_thread_state()->oops_do(f);
 }
 }
-void JavaThread::nmethods_do() {
+void JavaThread::nmethods_do(CodeBlobClosure* cf) {
-// Traverse the GCHandles
+Thread::nmethods_do(cf);  // (super method is a no-op)
-Thread::nmethods_do();
 assert( (!has_last_Java_frame() && java_call_counter() == 0) ||
 (has_last_Java_frame() && java_call_counter() > 0), "wrong java_sp info!");
 if (has_last_Java_frame()) {
 // Traverse the execution stack
 for(StackFrameStream fst(this); !fst.is_done(); fst.next()) {
-fst.current()->nmethods_do();
+fst.current()->nmethods_do(cf);
 }
 }
 }
 // Printing
 static void frame_verify(frame* f, const RegisterMap *map) { f->verify(map); }
 void JavaThread::verify() {
 // Verify oops in the thread.
-oops_do(&VerifyOopClosure::verify_oop);
+oops_do(&VerifyOopClosure::verify_oop, NULL);
 // Verify the stack frames.
 frames_do(frame_verify);
 }
 // In particular, these things should never be called when the Threads_lock
 // is held by some other thread. (Note: the Safepoint abstraction also
 // uses the Threads_lock to gurantee this property. It also makes sure that
 // all threads gets blocked when exiting or starting).
-void Threads::oops_do(OopClosure* f) {
+void Threads::oops_do(OopClosure* f, CodeBlobClosure* cf) {
 ALL_JAVA_THREADS(p) {
-p->oops_do(f);
+p->oops_do(f, cf);
 }
-VMThread::vm_thread()->oops_do(f);
+VMThread::vm_thread()->oops_do(f, cf);
 }
-void Threads::possibly_parallel_oops_do(OopClosure* f) {
+void Threads::possibly_parallel_oops_do(OopClosure* f, CodeBlobClosure* cf) {
 // Introduce a mechanism allowing parallel threads to claim threads as
 // root groups.  Overhead should be small enough to use all the time,
 // even in sequential code.
 SharedHeap* sh = SharedHeap::heap();
 bool is_par = (sh->n_par_threads() > 0);
 int cp = SharedHeap::heap()->strong_roots_parity();
 ALL_JAVA_THREADS(p) {
 if (p->claim_oops_do(is_par, cp)) {
-p->oops_do(f);
+p->oops_do(f, cf);
 }
 }
 VMThread* vmt = VMThread::vm_thread();
 if (vmt->claim_oops_do(is_par, cp))
-vmt->oops_do(f);
+vmt->oops_do(f, cf);
 }
 #ifndef SERIALGC
 // Used by ParallelScavenge
 void Threads::create_thread_roots_tasks(GCTaskQueue* q) {
 }
 q->enqueue(new ThreadRootsMarkingTask(VMThread::vm_thread()));
 }
 #endif // SERIALGC
-void Threads::nmethods_do() {
+void Threads::nmethods_do(CodeBlobClosure* cf) {
 ALL_JAVA_THREADS(p) {
-p->nmethods_do();
+p->nmethods_do(cf);
 }
-VMThread::vm_thread()->nmethods_do();
+VMThread::vm_thread()->nmethods_do(cf);
 }
 void Threads::gc_epilogue() {
 ALL_JAVA_THREADS(p) {
 p->gc_epilogue();

Mercurial > hg > truffle

comparison src/share/vm/runtime/thread.cpp @ 997:46b819ba120b