comparison src/share/vm/gc_implementation/g1/concurrentMark.cpp @ 1284:5f1f51edaff6

6928081: G1: rename parameters common with CMS Summary: Rename marking stack sizing flags to be common between G1 and CMS Reviewed-by: ysr, tonyp
author jmasa
date Wed, 24 Feb 2010 07:00:33 -0800
parents b81f3572f355
children 3f0549ed0c98
comparison
equal deleted inserted replaced
1283:1c72304f1885 1284:5f1f51edaff6
445 445
446 if (verbose_low()) 446 if (verbose_low())
447 gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " 447 gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
448 "heap end = "PTR_FORMAT, _heap_start, _heap_end); 448 "heap end = "PTR_FORMAT, _heap_start, _heap_end);
449 449
450 _markStack.allocate(G1MarkStackSize); 450 _markStack.allocate(MarkStackSize);
451 _regionStack.allocate(G1MarkRegionStackSize); 451 _regionStack.allocate(G1MarkRegionStackSize);
452 452
453 // Create & start a ConcurrentMark thread. 453 // Create & start a ConcurrentMark thread.
454 _cmThread = new ConcurrentMarkThread(this); 454 _cmThread = new ConcurrentMarkThread(this);
455 assert(cmThread() != NULL, "CM Thread should have been created"); 455 assert(cmThread() != NULL, "CM Thread should have been created");
481 481
482 _tasks[i] = new CMTask(i, this, task_queue, _task_queues); 482 _tasks[i] = new CMTask(i, this, task_queue, _task_queues);
483 _accum_task_vtime[i] = 0.0; 483 _accum_task_vtime[i] = 0.0;
484 } 484 }
485 485
486 if (ParallelMarkingThreads > ParallelGCThreads) { 486 if (ConcGCThreads > ParallelGCThreads) {
487 vm_exit_during_initialization("Can't have more ParallelMarkingThreads " 487 vm_exit_during_initialization("Can't have more ConcGCThreads "
488 "than ParallelGCThreads."); 488 "than ParallelGCThreads.");
489 } 489 }
490 if (ParallelGCThreads == 0) { 490 if (ParallelGCThreads == 0) {
491 // if we are not running with any parallel GC threads we will not 491 // if we are not running with any parallel GC threads we will not
492 // spawn any marking threads either 492 // spawn any marking threads either
493 _parallel_marking_threads = 0; 493 _parallel_marking_threads = 0;
494 _sleep_factor = 0.0; 494 _sleep_factor = 0.0;
495 _marking_task_overhead = 1.0; 495 _marking_task_overhead = 1.0;
496 } else { 496 } else {
497 if (ParallelMarkingThreads > 0) { 497 if (ConcGCThreads > 0) {
498 // notice that ParallelMarkingThreads overwrites G1MarkingOverheadPercent 498 // notice that ConcGCThreads overwrites G1MarkingOverheadPercent
499 // if both are set 499 // if both are set
500 500
501 _parallel_marking_threads = ParallelMarkingThreads; 501 _parallel_marking_threads = ConcGCThreads;
502 _sleep_factor = 0.0; 502 _sleep_factor = 0.0;
503 _marking_task_overhead = 1.0; 503 _marking_task_overhead = 1.0;
504 } else if (G1MarkingOverheadPercent > 0) { 504 } else if (G1MarkingOverheadPercent > 0) {
505 // we will calculate the number of parallel marking threads 505 // we will calculate the number of parallel marking threads
506 // based on a target overhead with respect to the soft real-time 506 // based on a target overhead with respect to the soft real-time