Revision: 24382
Author:   [email protected]
Date:     Thu Oct  2 08:24:48 2014 UTC
Log:      Remove support for parallel sweeping

BUG=none
[email protected]
LOG=y

Review URL: https://codereview.chromium.org/618323007
https://code.google.com/p/v8/source/detail?r=24382

Modified:
 /branches/bleeding_edge/src/flag-definitions.h
 /branches/bleeding_edge/src/heap/mark-compact.cc
 /branches/bleeding_edge/src/heap/mark-compact.h

=======================================
--- /branches/bleeding_edge/src/flag-definitions.h Wed Oct 1 09:16:28 2014 UTC +++ /branches/bleeding_edge/src/flag-definitions.h Thu Oct 2 08:24:48 2014 UTC
@@ -531,10 +531,6 @@
             "trace progress of the incremental marking")
 DEFINE_BOOL(track_gc_object_stats, false,
             "track object counts and memory usage")
-DEFINE_BOOL(parallel_sweeping, false, "enable parallel sweeping")
-DEFINE_BOOL(concurrent_sweeping, true, "enable concurrent sweeping")
-DEFINE_INT(sweeper_threads, 0,
-           "number of parallel and concurrent sweeping threads")
 #ifdef VERIFY_HEAP
 DEFINE_BOOL(verify_heap, false, "verify heap pointers before and after GC")
 #endif
@@ -663,8 +659,6 @@
 DEFINE_BOOL(predictable, false, "enable predictable mode")
 DEFINE_NEG_IMPLICATION(predictable, concurrent_recompilation)
 DEFINE_NEG_IMPLICATION(predictable, concurrent_osr)
-DEFINE_NEG_IMPLICATION(predictable, concurrent_sweeping)
-DEFINE_NEG_IMPLICATION(predictable, parallel_sweeping)


 //
=======================================
--- /branches/bleeding_edge/src/heap/mark-compact.cc Wed Oct 1 09:16:28 2014 UTC +++ /branches/bleeding_edge/src/heap/mark-compact.cc Thu Oct 2 08:24:48 2014 UTC
@@ -4167,7 +4167,6 @@

     switch (sweeper) {
       case CONCURRENT_SWEEPING:
-      case PARALLEL_SWEEPING:
         if (!parallel_sweeping_active) {
           if (FLAG_gc_verbose) {
             PrintF("Sweeping 0x%" V8PRIxPTR ".\n",
@@ -4216,19 +4215,6 @@
   // Give pages that are queued to be freed back to the OS.
   heap()->FreeQueuedChunks();
 }
-
-
-static bool ShouldStartSweeperThreads(MarkCompactCollector::SweeperType type) {
-  return (type == MarkCompactCollector::PARALLEL_SWEEPING ||
-          type == MarkCompactCollector::CONCURRENT_SWEEPING) &&
-         !FLAG_predictable;
-}
-
-
-static bool ShouldWaitForSweeperThreads(
-    MarkCompactCollector::SweeperType type) {
-  return type == MarkCompactCollector::PARALLEL_SWEEPING;
-}


 void MarkCompactCollector::SweepSpaces() {
@@ -4241,10 +4227,6 @@
 #ifdef DEBUG
   state_ = SWEEP_SPACES;
 #endif
-  SweeperType how_to_sweep = CONCURRENT_SWEEPING;
-  if (FLAG_parallel_sweeping) how_to_sweep = PARALLEL_SWEEPING;
-  if (FLAG_concurrent_sweeping) how_to_sweep = CONCURRENT_SWEEPING;
-
   MoveEvacuationCandidatesToEndOfPagesList();

   // Noncompacting collections simply sweep the spaces to clear the mark
@@ -4257,17 +4239,13 @@
                                 GCTracer::Scope::MC_SWEEP_OLDSPACE);
     {
       SequentialSweepingScope scope(this);
-      SweepSpace(heap()->old_pointer_space(), how_to_sweep);
-      SweepSpace(heap()->old_data_space(), how_to_sweep);
+      SweepSpace(heap()->old_pointer_space(), CONCURRENT_SWEEPING);
+      SweepSpace(heap()->old_data_space(), CONCURRENT_SWEEPING);
     }

-    if (ShouldStartSweeperThreads(how_to_sweep)) {
+    if (!FLAG_predictable) {
       StartSweeperThreads();
     }
-
-    if (ShouldWaitForSweeperThreads(how_to_sweep)) {
-      EnsureSweepingCompleted();
-    }
   }
   RemoveDeadInvalidatedCode();

=======================================
--- /branches/bleeding_edge/src/heap/mark-compact.h Wed Oct 1 09:16:28 2014 UTC +++ /branches/bleeding_edge/src/heap/mark-compact.h Thu Oct 2 08:24:48 2014 UTC
@@ -547,7 +547,6 @@
   void EnableCodeFlushing(bool enable);

   enum SweeperType {
-    PARALLEL_SWEEPING,
     CONCURRENT_SWEEPING,
     SEQUENTIAL_SWEEPING
   };

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to