Add Thread-based constructors to TimerScope, TimelineDurationScope.

runtime/vm/heap.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_HEAP_H_
 #define VM_HEAP_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
@@ skipping 201 matching lines @@
   void RecordTime(int id, int64_t micros) {
     ASSERT((id >= 0) && (id < GCStats::kDataEntries));
     stats_.times_[id] = micros;
   }
 
   void RecordData(int id, intptr_t value) {
     ASSERT((id >= 0) && (id < GCStats::kDataEntries));
     stats_.data_[id] = value;
   }
 
-  bool gc_in_progress() const { return gc_in_progress_; }
+  bool gc_in_progress();
 
   static bool IsAllocatableInNewSpace(intptr_t size) {
     return size <= kNewAllocatableSize;
   }
 
   void PrintToJSONObject(Space space, JSONObject* object) const;
 
   // The heap map contains the sizes and class ids for the objects in each page.
   void PrintHeapMapToJSONStream(Isolate* isolate, JSONStream* stream) {
     return old_space_.PrintHeapMapToJSONStream(isolate, stream);
@@ skipping 57 matching lines @@
   // ensure thread-safety.
   bool VerifyGC(MarkExpectation mark_expectation = kForbidMarked) const;
 
   // GC stats collection.
   void RecordBeforeGC(Space space, GCReason reason);
   void RecordAfterGC();
   void PrintStats();
   void UpdateClassHeapStatsBeforeGC(Heap::Space space);
   void UpdatePretenurePolicy();
 
+  // Updates gc_in_progress.
+  void BeginGC();
+  void EndGC();
+
   // If this heap is non-empty, updates start and end to the smallest range that
   // contains both the original [start, end) and the [lowest, highest) addresses
   // of this heap.
   void GetMergedAddressRange(uword* start, uword* end) const;
 
   Isolate* isolate_;
 
   // The different spaces used for allocation.
   Scavenger new_space_;
   PageSpace old_space_;
 
   WeakTable* new_weak_tables_[kNumWeakSelectors];
   WeakTable* old_weak_tables_[kNumWeakSelectors];
 
   // GC stats collection.
   GCStats stats_;
 
   // This heap is in read-only mode: No allocation is allowed.
   bool read_only_;
 
   // GC on the heap is in progress.
+  Mutex gc_in_progress_mutex_;
   bool gc_in_progress_;
 
   int pretenure_policy_;
 
   friend class ServiceEvent;
   friend class PageSpace;  // VerifyGC
   DISALLOW_COPY_AND_ASSIGN(Heap);
 };
 
 
@@ skipping 34 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_