| OLD | NEW |
|---|
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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 #ifndef VM_DART_H_ | 5 #ifndef VM_DART_H_ |
| 6 #define VM_DART_H_ | 6 #define VM_DART_H_ |
| 7 | 7 |
| 8 #include "include/dart_api.h" | 8 #include "include/dart_api.h" |
| 9 #include "vm/allocation.h" | 9 #include "vm/allocation.h" |
| 10 #include "vm/snapshot.h" | 10 #include "vm/snapshot.h" |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 | 110 |
| 111 static void set_entropy_source_callback(Dart_EntropySource entropy_source) { | 111 static void set_entropy_source_callback(Dart_EntropySource entropy_source) { |
| 112 entropy_source_callback_ = entropy_source; | 112 entropy_source_callback_ = entropy_source; |
| 113 } | 113 } |
| 114 static Dart_EntropySource entropy_source_callback() { | 114 static Dart_EntropySource entropy_source_callback() { |
| 115 return entropy_source_callback_; | 115 return entropy_source_callback_; |
| 116 } | 116 } |
| 117 | 117 |
| 118 private: | 118 private: |
| 119 static void WaitForIsolateShutdown(); | 119 static void WaitForIsolateShutdown(); |
| 120 static void WaitForApplicationIsolateShutdown(); |
| 120 | 121 |
| 121 static Isolate* vm_isolate_; | 122 static Isolate* vm_isolate_; |
| 122 static int64_t start_time_; | 123 static int64_t start_time_; |
| 123 static ThreadPool* thread_pool_; | 124 static ThreadPool* thread_pool_; |
| 124 static DebugInfo* pprof_symbol_generator_; | 125 static DebugInfo* pprof_symbol_generator_; |
| 125 static ReadOnlyHandles* predefined_handles_; | 126 static ReadOnlyHandles* predefined_handles_; |
| 126 static Snapshot::Kind snapshot_kind_; | 127 static Snapshot::Kind snapshot_kind_; |
| 127 static const uint8_t* instructions_snapshot_buffer_; | 128 static const uint8_t* instructions_snapshot_buffer_; |
| 128 static const uint8_t* data_snapshot_buffer_; | 129 static const uint8_t* data_snapshot_buffer_; |
| 129 static Dart_ThreadExitCallback thread_exit_callback_; | 130 static Dart_ThreadExitCallback thread_exit_callback_; |
| 130 static Dart_FileOpenCallback file_open_callback_; | 131 static Dart_FileOpenCallback file_open_callback_; |
| 131 static Dart_FileReadCallback file_read_callback_; | 132 static Dart_FileReadCallback file_read_callback_; |
| 132 static Dart_FileWriteCallback file_write_callback_; | 133 static Dart_FileWriteCallback file_write_callback_; |
| 133 static Dart_FileCloseCallback file_close_callback_; | 134 static Dart_FileCloseCallback file_close_callback_; |
| 134 static Dart_EntropySource entropy_source_callback_; | 135 static Dart_EntropySource entropy_source_callback_; |
| 135 }; | 136 }; |
| 136 | 137 |
| 137 } // namespace dart | 138 } // namespace dart |
| 138 | 139 |
| 139 #endif // VM_DART_H_ | 140 #endif // VM_DART_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2052343002:
Fix dead lock in isolate shutdown. (Closed)
Base URL: git@github.com:dart-lang/sdk.git@master