diff -r fd16c54261b3 -r 489c9b5090e2 hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2002-2006 Sun Microsystems, Inc.  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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_psTasks.cpp.incl"
+
+//
+// ScavengeRootsTask
+//
+
+// Define before use
+class PSScavengeRootsClosure: public OopClosure {
+ private:
+  PSPromotionManager* _promotion_manager;
+
+ public:
+  PSScavengeRootsClosure(PSPromotionManager* pm) : _promotion_manager(pm) { }
+
+  virtual void do_oop(oop* p) {
+    if (PSScavenge::should_scavenge(*p)) {
+      // We never card mark roots, maybe call a func without test?
+      PSScavenge::copy_and_push_safe_barrier(_promotion_manager, p);
+    }
+  }
+};
+
+void ScavengeRootsTask::do_it(GCTaskManager* manager, uint which) {
+  assert(Universe::heap()->is_gc_active(), "called outside gc");
+
+  PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
+  PSScavengeRootsClosure roots_closure(pm);
+
+  switch (_root_type) {
+    case universe:
+      Universe::oops_do(&roots_closure);
+      ReferenceProcessor::oops_do(&roots_closure);
+      break;
+
+    case jni_handles:
+      JNIHandles::oops_do(&roots_closure);
+      break;
+
+    case threads:
+    {
+      ResourceMark rm;
+      Threads::oops_do(&roots_closure);
+    }
+    break;
+
+    case object_synchronizer:
+      ObjectSynchronizer::oops_do(&roots_closure);
+      break;
+
+    case flat_profiler:
+      FlatProfiler::oops_do(&roots_closure);
+      break;
+
+    case system_dictionary:
+      SystemDictionary::oops_do(&roots_closure);
+      break;
+
+    case management:
+      Management::oops_do(&roots_closure);
+      break;
+
+    case jvmti:
+      JvmtiExport::oops_do(&roots_closure);
+      break;
+
+    default:
+      fatal("Unknown root type");
+  }
+
+  // Do the real work
+  pm->drain_stacks(false);
+}
+
+//
+// ThreadRootsTask
+//
+
+void ThreadRootsTask::do_it(GCTaskManager* manager, uint which) {
+  assert(Universe::heap()->is_gc_active(), "called outside gc");
+
+  PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
+  PSScavengeRootsClosure roots_closure(pm);
+
+  if (_java_thread != NULL)
+    _java_thread->oops_do(&roots_closure);
+
+  if (_vm_thread != NULL)
+    _vm_thread->oops_do(&roots_closure);
+
+  // Do the real work
+  pm->drain_stacks(false);
+}
+
+//
+// StealTask
+//
+
+StealTask::StealTask(ParallelTaskTerminator* t) :
+  _terminator(t) {}
+
+void StealTask::do_it(GCTaskManager* manager, uint which) {
+  assert(Universe::heap()->is_gc_active(), "called outside gc");
+
+  PSPromotionManager* pm =
+    PSPromotionManager::gc_thread_promotion_manager(which);
+  pm->drain_stacks(true);
+  guarantee(pm->stacks_empty(),
+            "stacks should be empty at this point");
+
+  int random_seed = 17;
+  if (pm->depth_first()) {
+    while(true) {
+      oop* p;
+      if (PSPromotionManager::steal_depth(which, &random_seed, p)) {
+#if PS_PM_STATS
+        pm->increment_steals(p);
+#endif // PS_PM_STATS
+        pm->process_popped_location_depth(p);
+        pm->drain_stacks_depth(true);
+      } else {
+        if (terminator()->offer_termination()) {
+          break;
+        }
+      }
+    }
+  } else {
+    while(true) {
+      oop obj;
+      if (PSPromotionManager::steal_breadth(which, &random_seed, obj)) {
+#if PS_PM_STATS
+        pm->increment_steals();
+#endif // PS_PM_STATS
+        obj->copy_contents(pm);
+        pm->drain_stacks_breadth(true);
+      } else {
+        if (terminator()->offer_termination()) {
+          break;
+        }
+      }
+    }
+  }
+  guarantee(pm->stacks_empty(),
+            "stacks should be empty at this point");
+}
+
+//
+// SerialOldToYoungRootsTask
+//
+
+void SerialOldToYoungRootsTask::do_it(GCTaskManager* manager, uint which) {
+  assert(_gen != NULL, "Sanity");
+  assert(_gen->object_space()->contains(_gen_top) || _gen_top == _gen->object_space()->top(), "Sanity");
+
+  {
+    PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
+
+    assert(Universe::heap()->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
+    CardTableExtension* card_table = (CardTableExtension *)Universe::heap()->barrier_set();
+    // FIX ME! Assert that card_table is the type we believe it to be.
+
+    card_table->scavenge_contents(_gen->start_array(),
+                                  _gen->object_space(),
+                                  _gen_top,
+                                  pm);
+
+    // Do the real work
+    pm->drain_stacks(false);
+  }
+}
+
+//
+// OldToYoungRootsTask
+//
+
+void OldToYoungRootsTask::do_it(GCTaskManager* manager, uint which) {
+  assert(_gen != NULL, "Sanity");
+  assert(_gen->object_space()->contains(_gen_top) || _gen_top == _gen->object_space()->top(), "Sanity");
+  assert(_stripe_number < ParallelGCThreads, "Sanity");
+
+  {
+    PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
+
+    assert(Universe::heap()->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
+    CardTableExtension* card_table = (CardTableExtension *)Universe::heap()->barrier_set();
+    // FIX ME! Assert that card_table is the type we believe it to be.
+
+    card_table->scavenge_contents_parallel(_gen->start_array(),
+                                           _gen->object_space(),
+                                           _gen_top,
+                                           pm,
+                                           _stripe_number);
+
+    // Do the real work
+    pm->drain_stacks(false);
+  }
+}