Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp @ 22298:c28cb37b2e1d
Rename JVMCI to INCLUDE_JVMCI.
author | twisti |
---|---|
date | Wed, 22 Jul 2015 08:56:03 -0700 |
parents | d86b226e331a |
children | dd9cc155639c |
comparison
equal
deleted
inserted
replaced
22297:571202729bbf | 22298:c28cb37b2e1d |
---|---|
2545 NOT_PRODUCT(GCTraceTime t("CMS:MS (foreground) ", PrintGCDetails && Verbose, | 2545 NOT_PRODUCT(GCTraceTime t("CMS:MS (foreground) ", PrintGCDetails && Verbose, |
2546 true, NULL, gc_id);) | 2546 true, NULL, gc_id);) |
2547 if (UseAdaptiveSizePolicy) { | 2547 if (UseAdaptiveSizePolicy) { |
2548 size_policy()->ms_collection_begin(); | 2548 size_policy()->ms_collection_begin(); |
2549 } | 2549 } |
2550 #if defined(COMPILER2) || defined(JVMCI) | 2550 #if defined(COMPILER2) || INCLUDE_JVMCI |
2551 DerivedPointerTableDeactivate dpt_deact; | 2551 DerivedPointerTableDeactivate dpt_deact; |
2552 #endif | 2552 #endif |
2553 | 2553 |
2554 HandleMark hm; // Discard invalid handles created during verification | 2554 HandleMark hm; // Discard invalid handles created during verification |
2555 | 2555 |
3021 // and traced those that need to be marked; moreover, | 3021 // and traced those that need to be marked; moreover, |
3022 // the marking done here is not going to intefere in any | 3022 // the marking done here is not going to intefere in any |
3023 // way with the marking information used by GC. | 3023 // way with the marking information used by GC. |
3024 NoRefDiscovery no_discovery(ref_processor()); | 3024 NoRefDiscovery no_discovery(ref_processor()); |
3025 | 3025 |
3026 #if defined(COMPILER2) || defined(JVMCI) | 3026 #if defined(COMPILER2) || INCLUDE_JVMCI |
3027 DerivedPointerTableDeactivate dpt_deact; | 3027 DerivedPointerTableDeactivate dpt_deact; |
3028 #endif | 3028 #endif |
3029 | 3029 |
3030 // Clear any marks from a previous round | 3030 // Clear any marks from a previous round |
3031 verification_mark_bm()->clear_all(); | 3031 verification_mark_bm()->clear_all(); |
3731 if (CMSPrintEdenSurvivorChunks) { | 3731 if (CMSPrintEdenSurvivorChunks) { |
3732 print_eden_and_survivor_chunk_arrays(); | 3732 print_eden_and_survivor_chunk_arrays(); |
3733 } | 3733 } |
3734 | 3734 |
3735 { | 3735 { |
3736 #if defined(COMPILER2) || defined(JVMCI) | 3736 #if defined(COMPILER2) || INCLUDE_JVMCI |
3737 DerivedPointerTableDeactivate dpt_deact; | 3737 DerivedPointerTableDeactivate dpt_deact; |
3738 #endif | 3738 #endif |
3739 if (CMSParallelInitialMarkEnabled && CollectedHeap::use_parallel_gc_threads()) { | 3739 if (CMSParallelInitialMarkEnabled && CollectedHeap::use_parallel_gc_threads()) { |
3740 // The parallel version. | 3740 // The parallel version. |
3741 FlexibleWorkGang* workers = gch->workers(); | 3741 FlexibleWorkGang* workers = gch->workers(); |
5123 if (CMSPrintEdenSurvivorChunks) { | 5123 if (CMSPrintEdenSurvivorChunks) { |
5124 print_eden_and_survivor_chunk_arrays(); | 5124 print_eden_and_survivor_chunk_arrays(); |
5125 } | 5125 } |
5126 | 5126 |
5127 { | 5127 { |
5128 #if defined(COMPILER2) || defined(JVMCI) | 5128 #if defined(COMPILER2) || INCLUDE_JVMCI |
5129 DerivedPointerTableDeactivate dpt_deact; | 5129 DerivedPointerTableDeactivate dpt_deact; |
5130 #endif | 5130 #endif |
5131 | 5131 |
5132 // Note on the role of the mod union table: | 5132 // Note on the role of the mod union table: |
5133 // Since the marker in "markFromRoots" marks concurrently with | 5133 // Since the marker in "markFromRoots" marks concurrently with |