diff options
| author | Richard Uhler <ruhler@google.com> | 2016-05-24 15:04:22 -0700 |
|---|---|---|
| committer | Richard Uhler <ruhler@google.com> | 2016-05-27 09:57:28 -0700 |
| commit | af0e482f81ed77c86b0e67ad5f1a7f7dbefda348 (patch) | |
| tree | d3ff11b92d5439f2ca833ba48f381ee86cb2047c /runtime/base/mutex.h | |
| parent | 6c5b9b91136aa4939d0252eb719c86289c72780e (diff) | |
| download | art-af0e482f81ed77c86b0e67ad5f1a7f7dbefda348.tar.gz art-af0e482f81ed77c86b0e67ad5f1a7f7dbefda348.tar.bz2 art-af0e482f81ed77c86b0e67ad5f1a7f7dbefda348.zip | |
Don't use dlopen on host for already loaded oat files.
Because the behavior of dlopen on the host is different then the
target in that case, and it causes tests to fail.
Bug: 28826195
(cherry picked from commit a206c745dbb64b14f05c87891d425475c2f6d63a)
Change-Id: I29b04be07b4d26dc1ac5e6f35550745eb15e6728
Diffstat (limited to 'runtime/base/mutex.h')
| -rw-r--r-- | runtime/base/mutex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index 3dca12a365..3d7624d979 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -83,7 +83,7 @@ enum LockLevel { kDexFileToMethodInlinerMapLock, kInternTableLock, kOatFileSecondaryLookupLock, - kOatFileCountLock, + kHostDlOpenHandlesLock, kOatFileManagerLock, kTracingUniqueMethodsLock, kTracingStreamingLock, @@ -651,11 +651,11 @@ class Locks { // Guards opened oat files in OatFileManager. static ReaderWriterMutex* oat_file_manager_lock_ ACQUIRED_AFTER(modify_ldt_lock_); - // Guards opened oat files in OatFileManager. - static ReaderWriterMutex* oat_file_count_lock_ ACQUIRED_AFTER(oat_file_manager_lock_); + // Guards dlopen_handles_ in DlOpenOatFile. + static Mutex* host_dlopen_handles_lock_ ACQUIRED_AFTER(oat_file_manager_lock_); // Guards intern table. - static Mutex* intern_table_lock_ ACQUIRED_AFTER(oat_file_count_lock_); + static Mutex* intern_table_lock_ ACQUIRED_AFTER(host_dlopen_handles_lock_); // Guards reference processor. static Mutex* reference_processor_lock_ ACQUIRED_AFTER(intern_table_lock_); |