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

Side by Side Diff: src/isolate.cc

Issue 1462573002: Wait for cancelable task after tearing down the heap. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | 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 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after
1914 bootstrapper_->TearDown(); 1914 bootstrapper_->TearDown();
1915 1915
1916 if (runtime_profiler_ != NULL) { 1916 if (runtime_profiler_ != NULL) {
1917 delete runtime_profiler_; 1917 delete runtime_profiler_;
1918 runtime_profiler_ = NULL; 1918 runtime_profiler_ = NULL;
1919 } 1919 }
1920 1920
1921 delete basic_block_profiler_; 1921 delete basic_block_profiler_;
1922 basic_block_profiler_ = NULL; 1922 basic_block_profiler_ = NULL;
1923 1923
1924 cancelable_task_manager()->CancelAndWait();
1925
1926 heap_.TearDown(); 1924 heap_.TearDown();
1927 logger_->TearDown(); 1925 logger_->TearDown();
1928 1926
1927 cancelable_task_manager()->CancelAndWait();
1928
1929 delete heap_profiler_; 1929 delete heap_profiler_;
1930 heap_profiler_ = NULL; 1930 heap_profiler_ = NULL;
1931 delete cpu_profiler_; 1931 delete cpu_profiler_;
1932 cpu_profiler_ = NULL; 1932 cpu_profiler_ = NULL;
1933 1933
1934 delete root_index_map_; 1934 delete root_index_map_;
1935 root_index_map_ = NULL; 1935 root_index_map_ = NULL;
1936 1936
1937 ClearSerializerData(); 1937 ClearSerializerData();
1938 } 1938 }
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
2840 // Then check whether this scope intercepts. 2840 // Then check whether this scope intercepts.
2841 if ((flag & intercept_mask_)) { 2841 if ((flag & intercept_mask_)) {
2842 intercepted_flags_ |= flag; 2842 intercepted_flags_ |= flag;
2843 return true; 2843 return true;
2844 } 2844 }
2845 return false; 2845 return false;
2846 } 2846 }
2847 2847
2848 } // namespace internal 2848 } // namespace internal
2849 } // namespace v8 2849 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698