Add TraceBuffer log to all Functions (plus small tweaks to function-view)

runtime/vm/trace_buffer.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 "vm/json_stream.h"
 #include "vm/os.h"
 #include "vm/trace_buffer.h"
 
 namespace dart {
 
@@ skipping 65 matching lines @@
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len+1));
   va_start(args, format);
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
   AppendTrace(micros, p);
 }
 
 
-void TraceBuffer::PrintToJSONStream(JSONStream* stream) const {
-  JSONObject json_trace_buffer(stream);
-  json_trace_buffer.AddProperty("type", "TraceBuffer");
+void TraceBuffer::PrintToJSONObject(JSONObject* json_trace_buffer) const {
+  json_trace_buffer->AddProperty("type", "TraceBuffer");
+  json_trace_buffer->AddProperty("id", "");
   // TODO(johnmccutchan): Send cursor position in response.
-  JSONArray json_trace_buffer_array(&json_trace_buffer, "members");
+  JSONArray json_trace_buffer_array(json_trace_buffer, "members");
   // Scan forward until we find the first entry which isn't empty.
   // TODO(johnmccutchan): Accept cursor start position as input.
   intptr_t start = -1;
   for (intptr_t i = 0; i < ring_capacity_; i++) {
     intptr_t index = RingIndex(i + ring_cursor_);
     if (!ring_[index].empty()) {
       start = index;
       break;
     }
   }
   // No messages in trace buffer.
   if (start == -1) {
     return;
   }
   for (intptr_t i = 0; i < ring_capacity_; i++) {
     intptr_t index = RingIndex(start + i);
     const TraceBufferEntry& entry = ring_[index];
     if (entry.empty()) {
       // Empty entry, stop.
       break;
     }
     JSONObject trace_entry(&json_trace_buffer_array);
     trace_entry.AddProperty("type", "TraceBufferEntry");
-    double seconds = static_cast<double>(entry.micros) /
-                     static_cast<double>(kMicrosecondsPerSecond);
-    trace_entry.AddProperty("time", seconds);
+    trace_entry.AddProperty("id", "");
+    intptr_t millis =
+        static_cast<intptr_t>(entry.micros / kMicrosecondsPerMillisecond);
+    trace_entry.AddProperty("time", millis);
     trace_entry.AddProperty("message", entry.message);
   }
 }
 
+
+void TraceBuffer::PrintToJSONStream(JSONStream* stream) const {
+  JSONObject json_trace_buffer(stream);
+  PrintToJSONObject(&json_trace_buffer);
+}
+
 }  // namespace dart