summaryrefslogtreecommitdiff
path: root/runtime/base/mutex.h
diff options
context:
space:
mode:
author David Sehr <sehr@google.com> 2017-02-01 10:42:11 -0800
committer David Sehr <sehr@google.com> 2017-02-06 11:54:10 -0800
commit1b14fb8bc459c3f91ed9fc1ff2e6c011c3d0a0f9 (patch)
treeac561b61e2bc75adbc3aaa6ea8154946f55bbaf1 /runtime/base/mutex.h
parent7b220d60e3cb58c384a0d245106406080c6f3e37 (diff)
Remove Mutex dependency from MemMap
Use std::mutex to remove the dependency between MemMap and Mutex/Thread, which depend upon Runtime. Next step towards making dexdump2 build and run on Windows. Bug: 22322814 Test: test-art Change-Id: Ia6f4ef882dcef516ee83a81e965b3d744ce325b0
Diffstat (limited to 'runtime/base/mutex.h')
-rw-r--r--runtime/base/mutex.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index 21dd437711..ffe18c6a50 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -55,7 +55,6 @@ class Thread;
// [1] http://www.drdobbs.com/parallel/use-lock-hierarchies-to-avoid-deadlock/204801163
enum LockLevel {
kLoggingLock = 0,
- kMemMapsLock,
kSwapMutexesLock,
kUnexpectedSignalLock,
kThreadSuspendCountLock,
@@ -712,9 +711,6 @@ class Locks {
// One unexpected signal at a time lock.
static Mutex* unexpected_signal_lock_ ACQUIRED_AFTER(thread_suspend_count_lock_);
- // Guards the maps in mem_map.
- static Mutex* mem_maps_lock_ ACQUIRED_AFTER(unexpected_signal_lock_);
-
// Have an exclusive logging thread.
static Mutex* logging_lock_ ACQUIRED_AFTER(unexpected_signal_lock_);
};