Changes to support dprof and Observatory profiler UIs

runtime/vm/profiler.h

 // Copyright (c) 2013, 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_PROFILER_H_
 #define VM_PROFILER_H_
 
 #include "vm/allocation.h"
 #include "vm/code_observers.h"
 #include "vm/globals.h"
 #include "vm/thread.h"
 #include "vm/thread_interrupter.h"
 
 namespace dart {
 
 // Forward declarations.
 class JSONArray;
 class JSONStream;
+class ProfilerSymbolHelper;
 struct Sample;
 
 // Profiler
 class Profiler : public AllStatic {
  public:
   static void InitOnce();
   static void Shutdown();
 
   static void InitProfilingForIsolate(Isolate* isolate,
                                       bool shared_buffer = false);
   static void ShutdownProfilingForIsolate(Isolate* isolate);
 
   static void BeginExecution(Isolate* isolate);
   static void EndExecution(Isolate* isolate);
 
   static void PrintToJSONStream(Isolate* isolate, JSONStream* stream);
-
-  static void WriteTracing(Isolate* isolate);
+  static void WriteSamples(Isolate* isolate);
 
   static SampleBuffer* sample_buffer() {
     return sample_buffer_;
   }
 
  private:
   static bool initialized_;
   static Monitor* monitor_;
 
-  static void WriteTracingSample(Isolate* isolate, intptr_t pid,
-                                 Sample* sample, JSONArray& events);
+  static void WriteSample(Isolate* isolate,
+                          ProfilerSymbolHelper* symbol_helper,
+                          Sample* sample, JSONArray& events);
 
   static void RecordTickInterruptCallback(const InterruptedThreadState& state,
                                           void* data);
 
   static void RecordSampleInterruptCallback(const InterruptedThreadState& state,
                                             void* data);
 
   static SampleBuffer* sample_buffer_;
 };
 
@@ skipping 44 matching lines @@
  public:
   static const intptr_t kDefaultBufferCapacity = 120000;  // 2 minutes @ 1000hz.
 
   explicit SampleBuffer(intptr_t capacity = kDefaultBufferCapacity);
   ~SampleBuffer();
 
   intptr_t capacity() const { return capacity_; }
 
   Sample* ReserveSample();
 
-  Sample* GetSample(intptr_t i) const {
+  Sample GetSample(intptr_t i) const {
     ASSERT(i >= 0);
     ASSERT(i < capacity_);
-    return &samples_[i];
+    return samples_[i];
   }
 
  private:
   Sample* samples_;
   intptr_t capacity_;
   uintptr_t cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(SampleBuffer);
 };
 
@@ skipping 23 matching lines @@
   const uintptr_t original_pc_;
   const uintptr_t original_fp_;
   const uintptr_t original_sp_;
   uintptr_t lower_bound_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_PROFILER_H_