Mercurial > hg > truffle
diff src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp @ 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 | da91efe96a93 |
children | 4c1b88a53c74 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -27,6 +27,7 @@ #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp" #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" +#include "oops/oop.inline.hpp" // Trim our work_queue so its length is below max at return inline void Par_MarkRefsIntoAndScanClosure::trim_queue(uint max) { @@ -43,42 +44,33 @@ } } -#ifndef PRODUCT -void KlassRememberingOopClosure::check_remember_klasses() const { - assert(_should_remember_klasses == must_remember_klasses(), - "Should remember klasses in this context."); +// CMSOopClosure and CMSoopsInGenClosure are duplicated, +// until we get rid of OopsInGenClosure. + +inline void CMSOopClosure::do_klass(Klass* k) { do_klass_nv(k); } +inline void CMSOopsInGenClosure::do_klass(Klass* k) { do_klass_nv(k); } + +inline void CMSOopClosure::do_klass_nv(Klass* k) { + ClassLoaderData* cld = k->class_loader_data(); + do_class_loader_data(cld); } -#endif - -void KlassRememberingOopClosure::remember_klass(Klass* k) { - if (!_revisit_stack->push(oop(k))) { - fatal("Revisit stack overflow in PushOrMarkClosure"); - } - check_remember_klasses(); +inline void CMSOopsInGenClosure::do_klass_nv(Klass* k) { + ClassLoaderData* cld = k->class_loader_data(); + do_class_loader_data(cld); } -inline void PushOrMarkClosure::remember_mdo(DataLayout* v) { - // TBD +inline void CMSOopClosure::do_class_loader_data(ClassLoaderData* cld) { + assert(_klass_closure._oop_closure == this, "Must be"); + + bool claim = true; // Must claim the class loader data before processing. + cld->oops_do(_klass_closure._oop_closure, &_klass_closure, claim); +} +inline void CMSOopsInGenClosure::do_class_loader_data(ClassLoaderData* cld) { + assert(_klass_closure._oop_closure == this, "Must be"); + + bool claim = true; // Must claim the class loader data before processing. + cld->oops_do(_klass_closure._oop_closure, &_klass_closure, claim); } -void Par_KlassRememberingOopClosure::remember_klass(Klass* k) { - if (!_revisit_stack->par_push(oop(k))) { - fatal("Revisit stack overflow in Par_KlassRememberingOopClosure"); - } - check_remember_klasses(); -} - -inline void Par_PushOrMarkClosure::remember_mdo(DataLayout* v) { - // TBD -} - -inline void PushOrMarkClosure::do_yield_check() { - _parent->do_yield_check(); -} - -inline void Par_PushOrMarkClosure::do_yield_check() { - _parent->do_yield_check(); -} - #endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP