OSDN Git Service

Merge "Reserve bits in the lock word for read barriers."
authorHiroshi Yamauchi <yamauchi@google.com>
Wed, 4 Mar 2015 01:37:11 +0000 (01:37 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 4 Mar 2015 01:37:11 +0000 (01:37 +0000)
1  2 
runtime/arch/arm/quick_entrypoints_arm.S
runtime/arch/arm64/quick_entrypoints_arm64.S
runtime/arch/x86/quick_entrypoints_x86.S
runtime/arch/x86_64/quick_entrypoints_x86_64.S
runtime/thread_list.cc

@@@ -51,9 -51,10 +51,9 @@@ static constexpr useconds_t kThreadSusp
  static constexpr useconds_t kThreadSuspendMaxSleepUs = 5000;
  
  ThreadList::ThreadList()
 -    : suspend_all_count_(0), debug_suspend_all_count_(0),
 -      thread_exit_cond_("thread exit condition variable", *Locks::thread_list_lock_),
 +    : suspend_all_count_(0), debug_suspend_all_count_(0), unregistering_count_(0),
        suspend_all_historam_("suspend all histogram", 16, 64) {
-   CHECK(Monitor::IsValidLockWord(LockWord::FromThinLockId(kMaxThreadId, 1)));
+   CHECK(Monitor::IsValidLockWord(LockWord::FromThinLockId(kMaxThreadId, 1, 0U)));
  }
  
  ThreadList::~ThreadList() {