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

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

Issue 2141763002: Hot reload fixes for isolate tests (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: ... Created 4 years, 5 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/bin/main.cc ('k') | tests/isolate/isolate.status » ('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 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 1711
1712 // Wait for background finalization to finish before shutting down. 1712 // Wait for background finalization to finish before shutting down.
1713 { 1713 {
1714 MonitorLocker ml(heap_->finalization_tasks_lock()); 1714 MonitorLocker ml(heap_->finalization_tasks_lock());
1715 while (heap_->finalization_tasks() > 0) { 1715 while (heap_->finalization_tasks() > 0) {
1716 ml.Wait(); 1716 ml.Wait();
1717 } 1717 }
1718 } 1718 }
1719 } 1719 }
1720 1720
1721 if (FLAG_check_reloaded && 1721 if (FLAG_check_reloaded && is_runnable() &&
1722 (this != Dart::vm_isolate()) && 1722 (this != Dart::vm_isolate()) &&
1723 !ServiceIsolate::IsServiceIsolateDescendant(this)) { 1723 !ServiceIsolate::IsServiceIsolateDescendant(this)) {
1724 if (!HasAttemptedReload()) { 1724 if (!HasAttemptedReload()) {
1725 FATAL("Isolate did not reload before exiting and " 1725 FATAL("Isolate did not reload before exiting and "
1726 "--check-reloaded is enabled.\n"); 1726 "--check-reloaded is enabled.\n");
1727 } 1727 }
1728 } 1728 }
1729 1729
1730 // Then, proceed with low-level teardown. 1730 // Then, proceed with low-level teardown.
1731 LowLevelShutdown(); 1731 LowLevelShutdown();
(...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after
2852 void IsolateSpawnState::DecrementSpawnCount() { 2852 void IsolateSpawnState::DecrementSpawnCount() {
2853 ASSERT(spawn_count_monitor_ != NULL); 2853 ASSERT(spawn_count_monitor_ != NULL);
2854 ASSERT(spawn_count_ != NULL); 2854 ASSERT(spawn_count_ != NULL);
2855 MonitorLocker ml(spawn_count_monitor_); 2855 MonitorLocker ml(spawn_count_monitor_);
2856 ASSERT(*spawn_count_ > 0); 2856 ASSERT(*spawn_count_ > 0);
2857 *spawn_count_ = *spawn_count_ - 1; 2857 *spawn_count_ = *spawn_count_ - 1;
2858 ml.Notify(); 2858 ml.Notify();
2859 } 2859 }
2860 2860
2861 } // namespace dart 2861 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/bin/main.cc ('k') | tests/isolate/isolate.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698