Do nothing in IncrementalMarking::Step when we are not marking or sweeping.

src/incremental-marking.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 520 matching lines @@
   if (FLAG_trace_incremental_marking) {
     PrintF("[IncrementalMarking] Complete (normal).\n");
   }
   heap_->isolate()->stack_guard()->RequestGC();
 }
 
 
 void IncrementalMarking::Step(intptr_t allocated_bytes) {
   if (heap_->gc_state() != Heap::NOT_IN_GC) return;
   if (!FLAG_incremental_marking) return;
   if (!FLAG_incremental_marking_steps) return;

[Lasse Reichstein, 2011/07/12 08:18:32]

Are FLAG_incremental_marking and FLAG_incremental_marking_steps forced to be
dependent in any way? Should they be (i.e., it seems it should be sufficient to
check FLAG_incremental_marking_steps)?

[Vyacheslav Egorov (Chromium), 2011/07/12 09:27:54]

They are independent.

+  if (state_ != SWEEPING && state_ != MARKING) return;

[Lasse Reichstein, 2011/07/12 08:18:32]

How about combining all these conditions with || and just having one return?

[Vyacheslav Egorov (Chromium), 2011/07/12 09:27:54]

Done.

 
   allocated_ += allocated_bytes;
 
   if (allocated_ < kAllocatedThreshold) return;
 
   intptr_t bytes_to_process = allocated_ * allocation_marking_factor_;
 
   double start = 0;
 
   if (FLAG_trace_incremental_marking || FLAG_trace_gc) {
@@ skipping 50 matching lines @@
   if (FLAG_trace_incremental_marking || FLAG_trace_gc) {
     double end = OS::TimeCurrentMillis();
     double delta = (end - start);
     steps_took_ += delta;
     steps_took_since_last_gc_ += delta;
   }
 }
 
 
 } }  // namespace v8::internal