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

Side by Side Diff: src/isolate.cc

Issue 2414073002: Revert of [heap] Cancel tasks before tearing down the heap. (Closed)
Patch Set: Created 4 years, 2 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 | « src/cancelable-task.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/isolate.h" 5 #include "src/isolate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <fstream> // NOLINT(readability/streams) 9 #include <fstream> // NOLINT(readability/streams)
10 #include <sstream> 10 #include <sstream>
(...skipping 2164 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 delete external_reference_table_; 2175 delete external_reference_table_;
2176 external_reference_table_ = NULL; 2176 external_reference_table_ = NULL;
2177 delete external_reference_map_; 2177 delete external_reference_map_;
2178 external_reference_map_ = NULL; 2178 external_reference_map_ = NULL;
2179 } 2179 }
2180 2180
2181 2181
2182 void Isolate::Deinit() { 2182 void Isolate::Deinit() {
2183 TRACE_ISOLATE(deinit); 2183 TRACE_ISOLATE(deinit);
2184 2184
2185 cancelable_task_manager()->CancelAndWait();
2186
2187 debug()->Unload(); 2185 debug()->Unload();
2188 2186
2189 FreeThreadResources(); 2187 FreeThreadResources();
2190 2188
2191 if (concurrent_recompilation_enabled()) { 2189 if (concurrent_recompilation_enabled()) {
2192 optimizing_compile_dispatcher_->Stop(); 2190 optimizing_compile_dispatcher_->Stop();
2193 delete optimizing_compile_dispatcher_; 2191 delete optimizing_compile_dispatcher_;
2194 optimizing_compile_dispatcher_ = NULL; 2192 optimizing_compile_dispatcher_ = NULL;
2195 } 2193 }
2196 2194
(...skipping 30 matching lines...) Expand all
2227 2225
2228 delete heap_profiler_; 2226 delete heap_profiler_;
2229 heap_profiler_ = NULL; 2227 heap_profiler_ = NULL;
2230 2228
2231 heap_.TearDown(); 2229 heap_.TearDown();
2232 logger_->TearDown(); 2230 logger_->TearDown();
2233 2231
2234 delete interpreter_; 2232 delete interpreter_;
2235 interpreter_ = NULL; 2233 interpreter_ = NULL;
2236 2234
2235 cancelable_task_manager()->CancelAndWait();
2236
2237 delete cpu_profiler_; 2237 delete cpu_profiler_;
2238 cpu_profiler_ = NULL; 2238 cpu_profiler_ = NULL;
2239 2239
2240 code_event_dispatcher_.reset(); 2240 code_event_dispatcher_.reset();
2241 2241
2242 delete root_index_map_; 2242 delete root_index_map_;
2243 root_index_map_ = NULL; 2243 root_index_map_ = NULL;
2244 2244
2245 ClearSerializerData(); 2245 ClearSerializerData();
2246 } 2246 }
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
3451 // Then check whether this scope intercepts. 3451 // Then check whether this scope intercepts.
3452 if ((flag & intercept_mask_)) { 3452 if ((flag & intercept_mask_)) {
3453 intercepted_flags_ |= flag; 3453 intercepted_flags_ |= flag;
3454 return true; 3454 return true;
3455 } 3455 }
3456 return false; 3456 return false;
3457 } 3457 }
3458 3458
3459 } // namespace internal 3459 } // namespace internal
3460 } // namespace v8 3460 } // namespace v8
OLDNEW
« no previous file with comments | « src/cancelable-task.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698