Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp @ 1286:ab75c83d7c37
Merge
author | johnc |
---|---|
date | Tue, 02 Mar 2010 13:57:46 -0800 |
parents | 5f1f51edaff6 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1281:7d236a9688c5 | 1286:ab75c83d7c37 |
---|---|
44 | 44 |
45 clear_internal_time_intervals(); | 45 clear_internal_time_intervals(); |
46 | 46 |
47 _processor_count = os::active_processor_count(); | 47 _processor_count = os::active_processor_count(); |
48 | 48 |
49 if (CMSConcurrentMTEnabled && (ParallelCMSThreads > 1)) { | 49 if (CMSConcurrentMTEnabled && (ConcGCThreads > 1)) { |
50 assert(_processor_count > 0, "Processor count is suspect"); | 50 assert(_processor_count > 0, "Processor count is suspect"); |
51 _concurrent_processor_count = MIN2((uint) ParallelCMSThreads, | 51 _concurrent_processor_count = MIN2((uint) ConcGCThreads, |
52 (uint) _processor_count); | 52 (uint) _processor_count); |
53 } else { | 53 } else { |
54 _concurrent_processor_count = 1; | 54 _concurrent_processor_count = 1; |
55 } | 55 } |
56 | 56 |