src/hotspot/share/gc/shared/gcConfiguration.cpp
changeset 59053 ba6c248cae19
parent 54780 f8d182aedc92
equal deleted inserted replaced
59051:f0312c7d5b37 59053:ba6c248cae19
     1 /*
     1 /*
     2  * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
     2  * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.
     7  * published by the Free Software Foundation.
    39 
    39 
    40   if (UseParallelGC) {
    40   if (UseParallelGC) {
    41     return ParallelScavenge;
    41     return ParallelScavenge;
    42   }
    42   }
    43 
    43 
    44   if (UseConcMarkSweepGC) {
       
    45     return ParNew;
       
    46   }
       
    47 
       
    48   if (UseZGC || UseShenandoahGC) {
    44   if (UseZGC || UseShenandoahGC) {
    49     return NA;
    45     return NA;
    50   }
    46   }
    51 
    47 
    52   return DefNew;
    48   return DefNew;
    53 }
    49 }
    54 
    50 
    55 GCName GCConfiguration::old_collector() const {
    51 GCName GCConfiguration::old_collector() const {
    56   if (UseG1GC) {
    52   if (UseG1GC) {
    57     return G1Old;
    53     return G1Old;
    58   }
       
    59 
       
    60   if (UseConcMarkSweepGC) {
       
    61     return ConcurrentMarkSweep;
       
    62   }
    54   }
    63 
    55 
    64   if (UseParallelOldGC) {
    56   if (UseParallelOldGC) {
    65     return ParallelOld;
    57     return ParallelOld;
    66   }
    58   }