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

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

Issue 2993863002: Fixes the regression caused by 7568e1f18e. (Closed)
Patch Set: Removes dead code from ScheduleThread 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') | 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) 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) &&
2578 (heap() != Dart::vm_isolate()->heap())) {
2579 mutator_thread_->set_top(0);
2580 mutator_thread_->set_end(0);
2581 }
2582 } 2577 }
2583 Thread::SetCurrent(thread); 2578 Thread::SetCurrent(thread);
2584 os_thread->EnableThreadInterrupts(); 2579 os_thread->EnableThreadInterrupts();
2585 } 2580 }
2586 return thread; 2581 return thread;
2587 } 2582 }
2588 2583
2589 void Isolate::UnscheduleThread(Thread* thread, 2584 void Isolate::UnscheduleThread(Thread* thread,
2590 bool is_mutator, 2585 bool is_mutator,
2591 bool bypass_safepoint) { 2586 bool bypass_safepoint) {
(...skipping 18 matching lines...) Expand all
2610 if (!bypass_safepoint) { 2605 if (!bypass_safepoint) {
2611 // Ensure that the thread reports itself as being at a safepoint. 2606 // Ensure that the thread reports itself as being at a safepoint.
2612 thread->EnterSafepoint(); 2607 thread->EnterSafepoint();
2613 } 2608 }
2614 OSThread* os_thread = thread->os_thread(); 2609 OSThread* os_thread = thread->os_thread();
2615 ASSERT(os_thread != NULL); 2610 ASSERT(os_thread != NULL);
2616 os_thread->DisableThreadInterrupts(); 2611 os_thread->DisableThreadInterrupts();
2617 os_thread->set_thread(NULL); 2612 os_thread->set_thread(NULL);
2618 OSThread::SetCurrent(os_thread); 2613 OSThread::SetCurrent(os_thread);
2619 if (is_mutator) { 2614 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; 2615 mutator_thread_ = NULL;
2628 } 2616 }
2629 thread->isolate_ = NULL; 2617 thread->isolate_ = NULL;
2630 thread->heap_ = NULL; 2618 thread->heap_ = NULL;
2631 thread->set_os_thread(NULL); 2619 thread->set_os_thread(NULL);
2632 thread->set_execution_state(Thread::kThreadInNative); 2620 thread->set_execution_state(Thread::kThreadInNative);
2633 thread->set_safepoint_state(Thread::SetAtSafepoint(true, 0)); 2621 thread->set_safepoint_state(Thread::SetAtSafepoint(true, 0));
2634 thread->clear_pending_functions(); 2622 thread->clear_pending_functions();
2635 ASSERT(thread->no_safepoint_scope_depth() == 0); 2623 ASSERT(thread->no_safepoint_scope_depth() == 0);
2636 // Return thread structure. 2624 // Return thread structure.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
2855 void IsolateSpawnState::DecrementSpawnCount() { 2843 void IsolateSpawnState::DecrementSpawnCount() {
2856 ASSERT(spawn_count_monitor_ != NULL); 2844 ASSERT(spawn_count_monitor_ != NULL);
2857 ASSERT(spawn_count_ != NULL); 2845 ASSERT(spawn_count_ != NULL);
2858 MonitorLocker ml(spawn_count_monitor_); 2846 MonitorLocker ml(spawn_count_monitor_);
2859 ASSERT(*spawn_count_ > 0); 2847 ASSERT(*spawn_count_ > 0);
2860 *spawn_count_ = *spawn_count_ - 1; 2848 *spawn_count_ = *spawn_count_ - 1;
2861 ml.Notify(); 2849 ml.Notify();
2862 } 2850 }
2863 2851
2864 } // namespace dart 2852 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/scavenger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698