Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Thu Mar 26 13:19:32 2015 +0100
     1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Mon Dec 01 15:24:56 2014 +0100
     1.3 @@ -598,7 +598,7 @@
     1.4    _collector_policy(cp),
     1.5    _should_unload_classes(CMSClassUnloadingEnabled),
     1.6    _concurrent_cycles_since_last_unload(0),
     1.7 -  _roots_scanning_options(SharedHeap::SO_None),
     1.8 +  _roots_scanning_options(GenCollectedHeap::SO_None),
     1.9    _inter_sweep_estimate(CMS_SweepWeight, CMS_SweepPadding),
    1.10    _intra_sweep_estimate(CMS_SweepWeight, CMS_SweepPadding),
    1.11    _gc_tracer_cm(new (ResourceObj::C_HEAP, mtGC) CMSTracer()),
    1.12 @@ -3068,7 +3068,7 @@
    1.13    gch->gen_process_roots(_cmsGen->level(),
    1.14                           true,   // younger gens are roots
    1.15                           true,   // activate StrongRootsScope
    1.16 -                         SharedHeap::ScanningOption(roots_scanning_options()),
    1.17 +                         GenCollectedHeap::ScanningOption(roots_scanning_options()),
    1.18                           should_unload_classes(),
    1.19                           &notOlder,
    1.20                           NULL,
    1.21 @@ -3136,7 +3136,7 @@
    1.22    gch->gen_process_roots(_cmsGen->level(),
    1.23                           true,   // younger gens are roots
    1.24                           true,   // activate StrongRootsScope
    1.25 -                         SharedHeap::ScanningOption(roots_scanning_options()),
    1.26 +                         GenCollectedHeap::ScanningOption(roots_scanning_options()),
    1.27                           should_unload_classes(),
    1.28                           &notOlder,
    1.29                           NULL,
    1.30 @@ -3327,7 +3327,7 @@
    1.31  void CMSCollector::setup_cms_unloading_and_verification_state() {
    1.32    const  bool should_verify =   VerifyBeforeGC || VerifyAfterGC || VerifyDuringGC
    1.33                               || VerifyBeforeExit;
    1.34 -  const  int  rso           =   SharedHeap::SO_AllCodeCache;
    1.35 +  const  int  rso           =   GenCollectedHeap::SO_AllCodeCache;
    1.36  
    1.37    // We set the proper root for this CMS cycle here.
    1.38    if (should_unload_classes()) {   // Should unload classes this cycle
    1.39 @@ -3753,7 +3753,7 @@
    1.40        gch->gen_process_roots(_cmsGen->level(),
    1.41                               true,   // younger gens are roots
    1.42                               true,   // activate StrongRootsScope
    1.43 -                             SharedHeap::ScanningOption(roots_scanning_options()),
    1.44 +                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
    1.45                               should_unload_classes(),
    1.46                               &notOlder,
    1.47                               NULL,
    1.48 @@ -5254,13 +5254,13 @@
    1.49    gch->gen_process_roots(_collector->_cmsGen->level(),
    1.50                           false,     // yg was scanned above
    1.51                           false,     // this is parallel code
    1.52 -                         SharedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
    1.53 +                         GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
    1.54                           _collector->should_unload_classes(),
    1.55                           &par_mri_cl,
    1.56                           NULL,
    1.57                           &cld_closure);
    1.58    assert(_collector->should_unload_classes()
    1.59 -         || (_collector->CMSCollector::roots_scanning_options() & SharedHeap::SO_AllCodeCache),
    1.60 +         || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
    1.61           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    1.62    _timer.stop();
    1.63    if (PrintCMSStatistics != 0) {
    1.64 @@ -5390,14 +5390,14 @@
    1.65    gch->gen_process_roots(_collector->_cmsGen->level(),
    1.66                           false,     // yg was scanned above
    1.67                           false,     // this is parallel code
    1.68 -                         SharedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
    1.69 +                         GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
    1.70                           _collector->should_unload_classes(),
    1.71                           &par_mrias_cl,
    1.72                           NULL,
    1.73                           NULL);     // The dirty klasses will be handled below
    1.74  
    1.75    assert(_collector->should_unload_classes()
    1.76 -         || (_collector->CMSCollector::roots_scanning_options() & SharedHeap::SO_AllCodeCache),
    1.77 +         || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
    1.78           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    1.79    _timer.stop();
    1.80    if (PrintCMSStatistics != 0) {
    1.81 @@ -5982,14 +5982,14 @@
    1.82      gch->gen_process_roots(_cmsGen->level(),
    1.83                             true,  // younger gens as roots
    1.84                             false, // use the local StrongRootsScope
    1.85 -                           SharedHeap::ScanningOption(roots_scanning_options()),
    1.86 +                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
    1.87                             should_unload_classes(),
    1.88                             &mrias_cl,
    1.89                             NULL,
    1.90                             NULL); // The dirty klasses will be handled below
    1.91  
    1.92      assert(should_unload_classes()
    1.93 -           || (roots_scanning_options() & SharedHeap::SO_AllCodeCache),
    1.94 +           || (roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
    1.95             "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    1.96    }
    1.97