# HG changeset patch
# User iignatyev
# Date 1462824184 -7200
# Node ID d644a48a74f4933b2f0fea98e50b5bf67705fd88
# Parent  685ac27ed264d570397c8894120f32443ee00c1d# Parent  6a4902a969d34000b2a58f3bba49e633724c3477
Merge

diff -r 685ac27ed264 -r d644a48a74f4 hotspot/src/share/vm/gc/parallel/pcTasks.cpp
--- a/hotspot/src/share/vm/gc/parallel/pcTasks.cpp	Fri May 06 17:51:11 2016 +0300
+++ b/hotspot/src/share/vm/gc/parallel/pcTasks.cpp	Mon May 09 22:03:04 2016 +0200
@@ -220,13 +220,13 @@
 }
 
 //
-// StealRegionCompactionTask
+// CompactionWithStealingTask
 //
 
-StealRegionCompactionTask::StealRegionCompactionTask(ParallelTaskTerminator* t):
+CompactionWithStealingTask::CompactionWithStealingTask(ParallelTaskTerminator* t):
   _terminator(t) {}
 
-void StealRegionCompactionTask::do_it(GCTaskManager* manager, uint which) {
+void CompactionWithStealingTask::do_it(GCTaskManager* manager, uint which) {
   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
 
   ParCompactionManager* cm =
diff -r 685ac27ed264 -r d644a48a74f4 hotspot/src/share/vm/gc/parallel/pcTasks.hpp
--- a/hotspot/src/share/vm/gc/parallel/pcTasks.hpp	Fri May 06 17:51:11 2016 +0300
+++ b/hotspot/src/share/vm/gc/parallel/pcTasks.hpp	Mon May 09 22:03:04 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,16 +195,16 @@
 };
 
 //
-// StealRegionCompactionTask
+// CompactionWithStealingTask
 //
 // This task is used to distribute work to idle threads.
 //
 
-class StealRegionCompactionTask : public GCTask {
+class CompactionWithStealingTask : public GCTask {
  private:
    ParallelTaskTerminator* const _terminator;
  public:
-  StealRegionCompactionTask(ParallelTaskTerminator* t);
+  CompactionWithStealingTask(ParallelTaskTerminator* t);
 
   char* name() { return (char *)"steal-region-task"; }
   ParallelTaskTerminator* terminator() { return _terminator; }
diff -r 685ac27ed264 -r d644a48a74f4 hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp
--- a/hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp	Fri May 06 17:51:11 2016 +0300
+++ b/hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp	Mon May 09 22:03:04 2016 +0200
@@ -40,7 +40,7 @@
   friend class ParallelTaskTerminator;
   friend class ParMarkBitMap;
   friend class PSParallelCompact;
-  friend class StealRegionCompactionTask;
+  friend class CompactionWithStealingTask;
   friend class UpdateAndFillClosure;
   friend class RefProcTaskExecutor;
   friend class IdleGCTask;
diff -r 685ac27ed264 -r d644a48a74f4 hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
--- a/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp	Fri May 06 17:51:11 2016 +0300
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp	Mon May 09 22:03:04 2016 +0200
@@ -2371,7 +2371,7 @@
   // Once a thread has drained it's stack, it should try to steal regions from
   // other threads.
   for (uint j = 0; j < parallel_gc_threads; j++) {
-    q->enqueue(new StealRegionCompactionTask(terminator_ptr));
+    q->enqueue(new CompactionWithStealingTask(terminator_ptr));
   }
 }