OLD | NEW |
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include <cstdlib> | 5 #include <cstdlib> |
6 | 6 |
7 #include "vm/atomic.h" | 7 #include "vm/atomic.h" |
8 #include "vm/isolate.h" | 8 #include "vm/isolate.h" |
9 #include "vm/json_stream.h" | 9 #include "vm/json_stream.h" |
10 #include "vm/lockers.h" | 10 #include "vm/lockers.h" |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 UNIMPLEMENTED(); | 414 UNIMPLEMENTED(); |
415 } | 415 } |
416 { | 416 { |
417 JSONObject args(&obj, "args"); | 417 JSONObject args(&obj, "args"); |
418 for (intptr_t i = 0; i < arguments_length_; i++) { | 418 for (intptr_t i = 0; i < arguments_length_; i++) { |
419 const TimelineEventArgument& arg = arguments_[i]; | 419 const TimelineEventArgument& arg = arguments_[i]; |
420 args.AddProperty(arg.name, arg.value); | 420 args.AddProperty(arg.name, arg.value); |
421 } | 421 } |
422 if (isolate_id_ != ILLEGAL_PORT) { | 422 if (isolate_id_ != ILLEGAL_PORT) { |
423 // If we have one, append the isolate id. | 423 // If we have one, append the isolate id. |
424 args.AddProperty("isolateNumber", isolate_id_); | 424 args.AddPropertyF("isolateNumber", "%" Pd64 "", |
| 425 static_cast<int64_t>(isolate_id_)); |
425 } | 426 } |
426 } | 427 } |
427 } | 428 } |
428 | 429 |
429 | 430 |
430 int64_t TimelineEvent::TimeOrigin() const { | 431 int64_t TimelineEvent::TimeOrigin() const { |
431 return timestamp0_; | 432 return timestamp0_; |
432 } | 433 } |
433 | 434 |
434 | 435 |
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 | 1131 |
1131 | 1132 |
1132 TimelineEventBlock* TimelineEventBlockIterator::Next() { | 1133 TimelineEventBlock* TimelineEventBlockIterator::Next() { |
1133 ASSERT(current_ != NULL); | 1134 ASSERT(current_ != NULL); |
1134 TimelineEventBlock* r = current_; | 1135 TimelineEventBlock* r = current_; |
1135 current_ = current_->next(); | 1136 current_ = current_->next(); |
1136 return r; | 1137 return r; |
1137 } | 1138 } |
1138 | 1139 |
1139 } // namespace dart | 1140 } // namespace dart |
OLD | NEW |