Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Side by Side Diff: runtime/vm/isolate.cc

Issue 2002253005: Speculatively revert "Make the object store visible in Observatory." (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « runtime/observatory/observatory_sources.gypi ('k') | runtime/vm/object_store.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, 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 "vm/isolate.h" 5 #include "vm/isolate.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "include/dart_native_api.h" 8 #include "include/dart_native_api.h"
9 #include "platform/assert.h" 9 #include "platform/assert.h"
10 #include "platform/text_buffer.h" 10 #include "platform/text_buffer.h"
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 ExceptionPauseInfoToServiceEnum(debugger()->GetExceptionPauseInfo())); 1894 ExceptionPauseInfoToServiceEnum(debugger()->GetExceptionPauseInfo()));
1895 } 1895 }
1896 1896
1897 const Library& lib = 1897 const Library& lib =
1898 Library::Handle(object_store()->root_library()); 1898 Library::Handle(object_store()->root_library());
1899 if (!lib.IsNull()) { 1899 if (!lib.IsNull()) {
1900 jsobj.AddProperty("rootLib", lib); 1900 jsobj.AddProperty("rootLib", lib);
1901 } 1901 }
1902 1902
1903 { 1903 {
1904 JSONObject objectStore(&jsobj, "_objectStore");
1905 object_store()->PrintToJSONObject(&objectStore);
1906 }
1907
1908 {
1909 JSONObject tagCounters(&jsobj, "_tagCounters"); 1904 JSONObject tagCounters(&jsobj, "_tagCounters");
1910 vm_tag_counters()->PrintToJSONObject(&tagCounters); 1905 vm_tag_counters()->PrintToJSONObject(&tagCounters);
1911 } 1906 }
1912 if (Thread::Current()->sticky_error() != Object::null()) { 1907 if (Thread::Current()->sticky_error() != Object::null()) {
1913 Error& error = Error::Handle(Thread::Current()->sticky_error()); 1908 Error& error = Error::Handle(Thread::Current()->sticky_error());
1914 ASSERT(!error.IsNull()); 1909 ASSERT(!error.IsNull());
1915 jsobj.AddProperty("error", error, false); 1910 jsobj.AddProperty("error", error, false);
1916 } else if (sticky_error() != Object::null()) { 1911 } else if (sticky_error() != Object::null()) {
1917 Error& error = Error::Handle(sticky_error()); 1912 Error& error = Error::Handle(sticky_error());
1918 ASSERT(!error.IsNull()); 1913 ASSERT(!error.IsNull());
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
2797 void IsolateSpawnState::DecrementSpawnCount() { 2792 void IsolateSpawnState::DecrementSpawnCount() {
2798 ASSERT(spawn_count_monitor_ != NULL); 2793 ASSERT(spawn_count_monitor_ != NULL);
2799 ASSERT(spawn_count_ != NULL); 2794 ASSERT(spawn_count_ != NULL);
2800 MonitorLocker ml(spawn_count_monitor_); 2795 MonitorLocker ml(spawn_count_monitor_);
2801 ASSERT(*spawn_count_ > 0); 2796 ASSERT(*spawn_count_ > 0);
2802 *spawn_count_ = *spawn_count_ - 1; 2797 *spawn_count_ = *spawn_count_ - 1;
2803 ml.Notify(); 2798 ml.Notify();
2804 } 2799 }
2805 2800
2806 } // namespace dart 2801 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/observatory/observatory_sources.gypi ('k') | runtime/vm/object_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698