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

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

Issue 2349853002: VM: Fix for deadlock with background tasks. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | runtime/vm/gc_sweeper.cc » ('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) 2016, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2016, 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/dart_api_state.h" 5 #include "vm/dart_api_state.h"
6 6
7 #include "platform/assert.h" 7 #include "platform/assert.h"
8 #include "platform/utils.h" 8 #include "platform/utils.h"
9 #include "vm/heap.h" 9 #include "vm/heap.h"
10 #include "vm/isolate.h" 10 #include "vm/isolate.h"
11 #include "vm/lockers.h" 11 #include "vm/lockers.h"
12 #include "vm/thread.h" 12 #include "vm/thread.h"
13 #include "vm/timeline.h" 13 #include "vm/timeline.h"
14 14
15 namespace dart { 15 namespace dart {
16 16
17 BackgroundFinalizer::BackgroundFinalizer(Isolate* isolate, 17 BackgroundFinalizer::BackgroundFinalizer(Isolate* isolate,
18 FinalizationQueue* queue) : 18 FinalizationQueue* queue) :
19 isolate_(isolate), 19 isolate_(isolate),
20 queue_(queue) { 20 queue_(queue) {
21 ASSERT(FLAG_background_finalization); 21 ASSERT(FLAG_background_finalization);
22 PageSpace* old_space = isolate->heap()->old_space(); 22 PageSpace* old_space = isolate->heap()->old_space();
23 MonitorLocker ml(old_space->tasks_lock()); 23 MonitorLocker ml(old_space->tasks_lock());
24 old_space->set_tasks(old_space->tasks() + 1); 24 old_space->set_tasks(old_space->tasks() + 1);
25 ml.Notify();
26 } 25 }
27 26
28 27
29 void BackgroundFinalizer::Run() { 28 void BackgroundFinalizer::Run() {
30 bool result = Thread::EnterIsolateAsHelper(isolate_, 29 bool result = Thread::EnterIsolateAsHelper(isolate_,
31 Thread::kFinalizerTask); 30 Thread::kFinalizerTask);
32 ASSERT(result); 31 ASSERT(result);
33 32
34 { 33 {
35 Thread* thread = Thread::Current(); 34 Thread* thread = Thread::Current();
36 TIMELINE_FUNCTION_GC_DURATION(thread, "BackgroundFinalization"); 35 TIMELINE_FUNCTION_GC_DURATION(thread, "BackgroundFinalization");
37 TransitionVMToNative transition(thread); 36 TransitionVMToNative transition(thread);
38 for (intptr_t i = 0; i < queue_->length(); i++) { 37 for (intptr_t i = 0; i < queue_->length(); i++) {
39 FinalizablePersistentHandle* handle = (*queue_)[i]; 38 FinalizablePersistentHandle* handle = (*queue_)[i];
40 FinalizablePersistentHandle::Finalize(isolate_, handle); 39 FinalizablePersistentHandle::Finalize(isolate_, handle);
41 } 40 }
42 delete queue_; 41 delete queue_;
43 } 42 }
44 43
45 // Exit isolate cleanly *before* notifying it, to avoid shutdown race. 44 // Exit isolate cleanly *before* notifying it, to avoid shutdown race.
46 Thread::ExitIsolateAsHelper(); 45 Thread::ExitIsolateAsHelper();
47 46
48 { 47 {
49 PageSpace* old_space = isolate_->heap()->old_space(); 48 PageSpace* old_space = isolate_->heap()->old_space();
50 MonitorLocker ml(old_space->tasks_lock()); 49 MonitorLocker ml(old_space->tasks_lock());
51 old_space->set_tasks(old_space->tasks() - 1); 50 old_space->set_tasks(old_space->tasks() - 1);
52 ml.Notify(); 51 ml.NotifyAll();
53 } 52 }
54 } 53 }
55 54
56 } // namespace dart 55 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/gc_sweeper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698