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

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

Issue 2993863002: Fixes the regression caused by 7568e1f18e. (Closed)
Patch Set: Created 3 years, 4 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/scavenger.cc » ('j') | runtime/vm/scavenger.cc » ('J')
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 2556 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 thread->heap_ = heap(); 2567 thread->heap_ = heap();
2568 thread->set_os_thread(os_thread); 2568 thread->set_os_thread(os_thread);
2569 ASSERT(thread->execution_state() == Thread::kThreadInNative); 2569 ASSERT(thread->execution_state() == Thread::kThreadInNative);
2570 thread->set_execution_state(Thread::kThreadInVM); 2570 thread->set_execution_state(Thread::kThreadInVM);
2571 thread->set_safepoint_state(0); 2571 thread->set_safepoint_state(0);
2572 thread->set_vm_tag(VMTag::kVMTagId); 2572 thread->set_vm_tag(VMTag::kVMTagId);
2573 ASSERT(thread->no_safepoint_scope_depth() == 0); 2573 ASSERT(thread->no_safepoint_scope_depth() == 0);
2574 os_thread->set_thread(thread); 2574 os_thread->set_thread(thread);
2575 if (is_mutator) { 2575 if (is_mutator) {
2576 mutator_thread_ = thread; 2576 mutator_thread_ = thread;
2577 if ((Dart::vm_isolate() != NULL) && 2577 if ((Dart::vm_isolate() != NULL) &&
rmacnak 2017/08/07 21:29:35 Isn't this always a no-op now? Either the Thread s
danunez 2017/08/07 23:09:59 This is a no-op. This will be deleted.
2578 (heap() != Dart::vm_isolate()->heap())) { 2578 (heap() != Dart::vm_isolate()->heap()) &&
2579 (!mutator_thread_->HasActiveTLAB())) {
2579 mutator_thread_->set_top(0); 2580 mutator_thread_->set_top(0);
2580 mutator_thread_->set_end(0); 2581 mutator_thread_->set_end(0);
2581 } 2582 }
2582 } 2583 }
2583 Thread::SetCurrent(thread); 2584 Thread::SetCurrent(thread);
2584 os_thread->EnableThreadInterrupts(); 2585 os_thread->EnableThreadInterrupts();
2585 } 2586 }
2586 return thread; 2587 return thread;
2587 } 2588 }
2588 2589
(...skipping 21 matching lines...) Expand all
2610 if (!bypass_safepoint) { 2611 if (!bypass_safepoint) {
2611 // Ensure that the thread reports itself as being at a safepoint. 2612 // Ensure that the thread reports itself as being at a safepoint.
2612 thread->EnterSafepoint(); 2613 thread->EnterSafepoint();
2613 } 2614 }
2614 OSThread* os_thread = thread->os_thread(); 2615 OSThread* os_thread = thread->os_thread();
2615 ASSERT(os_thread != NULL); 2616 ASSERT(os_thread != NULL);
2616 os_thread->DisableThreadInterrupts(); 2617 os_thread->DisableThreadInterrupts();
2617 os_thread->set_thread(NULL); 2618 os_thread->set_thread(NULL);
2618 OSThread::SetCurrent(os_thread); 2619 OSThread::SetCurrent(os_thread);
2619 if (is_mutator) { 2620 if (is_mutator) {
2620 if ((Dart::vm_isolate() != NULL) &&
2621 (heap() != Dart::vm_isolate()->heap())) {
2622 if (mutator_thread_->HasActiveTLAB()) {
2623 heap()->AbandonRemainingTLAB(mutator_thread_);
2624 }
2625 }
2626 ASSERT(!mutator_thread_->HasActiveTLAB());
2627 mutator_thread_ = NULL; 2621 mutator_thread_ = NULL;
2628 } 2622 }
2629 thread->isolate_ = NULL; 2623 thread->isolate_ = NULL;
2630 thread->heap_ = NULL; 2624 thread->heap_ = NULL;
2631 thread->set_os_thread(NULL); 2625 thread->set_os_thread(NULL);
2632 thread->set_execution_state(Thread::kThreadInNative); 2626 thread->set_execution_state(Thread::kThreadInNative);
2633 thread->set_safepoint_state(Thread::SetAtSafepoint(true, 0)); 2627 thread->set_safepoint_state(Thread::SetAtSafepoint(true, 0));
2634 thread->clear_pending_functions(); 2628 thread->clear_pending_functions();
2635 ASSERT(thread->no_safepoint_scope_depth() == 0); 2629 ASSERT(thread->no_safepoint_scope_depth() == 0);
2636 // Return thread structure. 2630 // Return thread structure.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
2855 void IsolateSpawnState::DecrementSpawnCount() { 2849 void IsolateSpawnState::DecrementSpawnCount() {
2856 ASSERT(spawn_count_monitor_ != NULL); 2850 ASSERT(spawn_count_monitor_ != NULL);
2857 ASSERT(spawn_count_ != NULL); 2851 ASSERT(spawn_count_ != NULL);
2858 MonitorLocker ml(spawn_count_monitor_); 2852 MonitorLocker ml(spawn_count_monitor_);
2859 ASSERT(*spawn_count_ > 0); 2853 ASSERT(*spawn_count_ > 0);
2860 *spawn_count_ = *spawn_count_ - 1; 2854 *spawn_count_ = *spawn_count_ - 1;
2861 ml.Notify(); 2855 ml.Notify();
2862 } 2856 }
2863 2857
2864 } // namespace dart 2858 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/scavenger.cc » ('j') | runtime/vm/scavenger.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698