diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-07-03 02:23:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-03 02:23:24 +0000 |
| commit | 190dec7168f4fa45d85be0590051b0c53dba5378 (patch) | |
| tree | 64c0116e3a8839e29d875ba6d17a0c8562fac8b1 | |
| parent | 2010a6004fb083eb4109c21886fce6ee65abda33 (diff) | |
| parent | 73cca6ff8a8134ddbf56c8aef80bb3cc46b83a7d (diff) | |
| download | art-190dec7168f4fa45d85be0590051b0c53dba5378.zip art-190dec7168f4fa45d85be0590051b0c53dba5378.tar.gz art-190dec7168f4fa45d85be0590051b0c53dba5378.tar.bz2 | |
Merge "Fix DDMS lock ordering error." into dalvik-dev
| -rw-r--r-- | src/jdwp/jdwp_main.cc | 4 | ||||
| -rw-r--r-- | src/locks.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jdwp/jdwp_main.cc b/src/jdwp/jdwp_main.cc index df74988..3b6dd81 100644 --- a/src/jdwp/jdwp_main.cc +++ b/src/jdwp/jdwp_main.cc @@ -36,7 +36,7 @@ static void* StartJdwpThread(void* arg); * JdwpNetStateBase class implementation */ JdwpNetStateBase::JdwpNetStateBase(JdwpState* state) - : state_(state), socket_lock_("JdwpNetStateBase lock") { + : state_(state), socket_lock_("JdwpNetStateBase lock", kJdwpSerialSocketLock) { clientSock = -1; wake_pipe_[0] = -1; wake_pipe_[1] = -1; @@ -211,7 +211,7 @@ JdwpState::JdwpState(const JdwpOptions* options) attach_lock_("JDWP attach lock", kJdwpAttachLock), attach_cond_("JDWP attach condition variable", attach_lock_), last_activity_time_ms_(0), - serial_lock_("JDWP serial lock", kJdwpSerialLock), + serial_lock_("JDWP serial lock", kJdwpSerialSocketLock), request_serial_(0x10000000), event_serial_(0x20000000), event_list_lock_("JDWP event list lock", kJdwpEventListLock), diff --git a/src/locks.h b/src/locks.h index 202fa02..91437e1 100644 --- a/src/locks.h +++ b/src/locks.h @@ -36,9 +36,9 @@ enum LockLevel { kUnexpectedSignalLock, kThreadSuspendCountLock, kAbortLock, + kJdwpSerialSocketLock, kAllocSpaceLock, kDefaultMutexLevel, - kJdwpSerialLock, kMarkSweepLargeObjectLock, kPinTableLock, kLoadLibraryLock, |