Small changes in profiler

runtime/vm/profiler.cc

 // 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.
 
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
 #include "vm/code_patcher.h"
 #include "vm/isolate.h"
@@ skipping 180 matching lines @@
     kCollectedCode,
     kNativeCode
   };
 
   CodeRegion(Kind kind, uword start, uword end) :
       kind_(kind),
       start_(start),
       end_(end),
       inclusive_ticks_(0),
       exclusive_ticks_(0),
+      inclusive_tick_serial_(0),

[turnidge, 2014/03/06 16:36:42]

What is this used for?

       name_(NULL),
       address_table_(new ZoneGrowableArray<AddressEntry>()),
       callers_table_(new ZoneGrowableArray<CallEntry>()),
       callees_table_(new ZoneGrowableArray<CallEntry>()) {
     ASSERT(start_ < end_);
   }
 
   ~CodeRegion() {
   }
 
@@ skipping 93 matching lines @@
       if (entry.pc == pc) {
         entry.tick(exclusive);
         return;
       }
       if (entry.pc > pc) {
         break;
       }
     }
     AddressEntry entry;
     entry.pc = pc;
+    entry.exclusive_ticks = 0;
+    entry.inclusive_ticks = 0;
     entry.tick(exclusive);
     if (i < length) {
       // Insert at i.
       address_table_->InsertAt(i, entry);
     } else {
       // Add to end.
       address_table_->Add(entry);
     }
   }
 
@@ skipping 368 matching lines @@
   ZoneGrowableArray<CodeRegion*>* code_region_table_;
 };
 
 
 class CodeRegionTableBuilder : public SampleVisitor {
  public:
   CodeRegionTableBuilder(Isolate* isolate,
                          ProfilerCodeRegionTable* code_region_table)
       : SampleVisitor(isolate), code_region_table_(code_region_table) {
     frames_ = 0;
+    min_time_ = kMaxInt64;
+    max_time_ = 0;
   }
 
   void VisitSample(Sample* sample) {
+    int64_t timestamp = sample->timestamp();
+    if (timestamp > max_time_) {
+      max_time_ = timestamp;
+    }
+    if (timestamp < min_time_) {
+      min_time_ = timestamp;
+    }
     // Give the bottom frame an exclusive tick.
     code_region_table_->AddTick(sample->At(0), true, -1);
     // Give all frames (including the bottom) an inclusive tick.
     for (intptr_t i = 0; i < FLAG_profile_depth; i++) {
       if (sample->At(i) == 0) {
         break;
       }
       frames_++;
       code_region_table_->AddTick(sample->At(i), false, visited());
     }
   }
 
   intptr_t frames() const { return frames_; }
+  intptr_t  TimeDeltaMicros() const {
+    return static_cast<intptr_t>(max_time_ - min_time_);
+  }
+  int64_t  max_time() const { return max_time_; }
 
  private:
   intptr_t frames_;
+  int64_t min_time_;
+  int64_t max_time_;
   ProfilerCodeRegionTable* code_region_table_;
 };
 
 
 class CodeRegionTableCallersBuilder : public SampleVisitor {
  public:
   CodeRegionTableCallersBuilder(Isolate* isolate,
                                 ProfilerCodeRegionTable* code_region_table)
       : SampleVisitor(isolate), code_region_table_(code_region_table) {
     ASSERT(code_region_table_ != NULL);
@@ skipping 69 matching lines @@
       if (FLAG_trace_profiled_isolates) {
         OS::Print("%" Pd " frames produced %" Pd " code objects.\n",
                   frames, code_region_table.Length());
       }
       {
         ScopeStopwatch sw("CodeTableStream");
         // Serialize to JSON.
         JSONObject obj(stream);
         obj.AddProperty("type", "Profile");
         obj.AddProperty("samples", samples);
+        obj.AddProperty("time_delta_micros", builder.TimeDeltaMicros());
         JSONArray codes(&obj, "codes");
         for (intptr_t i = 0; i < code_region_table.Length(); i++) {
           CodeRegion* region = code_region_table.At(i);
           ASSERT(region != NULL);
           region->PrintToJSONArray(isolate, &codes, full);
         }
       }
     }
   }
   // Enable profile interrupts.
@@ skipping 212 matching lines @@
     stack_lower = 0;
     stack_upper = 0;
   }
   ProfilerSampleStackWalker stackWalker(sample, stack_lower, stack_upper,
                                         state.pc, state.fp, state.sp);
   stackWalker.walk(isolate->heap());
 }
 
 
 }  // namespace dart