forked from xen0n/android_system_core_mtk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/cm-13.0' into cm-13.0
- Loading branch information
Showing
15 changed files
with
302 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| #pragma once | ||
|
|
||
| /* | ||
| * Copyright (C) 2016 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #if defined(_WIN32) | ||
|
|
||
| #include <windows.h> | ||
|
|
||
| #include <android-base/macros.h> | ||
|
|
||
| #include "adb.h" | ||
|
|
||
| // The prebuilt version of mingw we use doesn't support mutex or recursive_mutex. | ||
| // Therefore, implement our own using the Windows primitives. | ||
| // Put them directly into the std namespace, so that when they're actually available, the build | ||
| // breaks until they're removed. | ||
|
|
||
| #include <mutex> | ||
| namespace std { | ||
|
|
||
| // CRITICAL_SECTION is recursive, so just wrap it in a Mutex-compatible class. | ||
| class recursive_mutex { | ||
| public: | ||
| recursive_mutex() { | ||
| InitializeCriticalSection(&mutex_); | ||
| } | ||
|
|
||
| ~recursive_mutex() { | ||
| DeleteCriticalSection(&mutex_); | ||
| } | ||
|
|
||
| void lock() { | ||
| EnterCriticalSection(&mutex_); | ||
| } | ||
|
|
||
| bool try_lock() { | ||
| return TryEnterCriticalSection(&mutex_); | ||
| } | ||
|
|
||
| void unlock() { | ||
| LeaveCriticalSection(&mutex_); | ||
| } | ||
|
|
||
| private: | ||
| CRITICAL_SECTION mutex_; | ||
|
|
||
| DISALLOW_COPY_AND_ASSIGN(recursive_mutex); | ||
| }; | ||
|
|
||
| class mutex { | ||
| public: | ||
| mutex() { | ||
| } | ||
|
|
||
| ~mutex() { | ||
| } | ||
|
|
||
| void lock() { | ||
| mutex_.lock(); | ||
| if (++lock_count_ != 1) { | ||
| fatal("non-recursive mutex locked reentrantly"); | ||
| } | ||
| } | ||
|
|
||
| void unlock() { | ||
| if (--lock_count_ != 0) { | ||
| fatal("non-recursive mutex unlock resulted in unexpected lock count: %d", lock_count_); | ||
| } | ||
| mutex_.unlock(); | ||
| } | ||
|
|
||
| bool try_lock() { | ||
| if (!mutex_.try_lock()) { | ||
| return false; | ||
| } | ||
|
|
||
| if (lock_count_ != 0) { | ||
| mutex_.unlock(); | ||
| return false; | ||
| } | ||
|
|
||
| ++lock_count_; | ||
| return true; | ||
| } | ||
|
|
||
| private: | ||
| recursive_mutex mutex_; | ||
| size_t lock_count_ = 0; | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| #elif defined(__BIONIC__) | ||
|
|
||
| // On M, the recovery image uses parts of adb that depends on recursive_mutex, and uses libstdc++, | ||
| // which lacks it. | ||
|
|
||
| #include <pthread.h> | ||
| #include <mutex> | ||
|
|
||
| #include <base/macros.h> | ||
|
|
||
| class recursive_mutex { | ||
| public: | ||
| recursive_mutex() { | ||
| } | ||
|
|
||
| ~recursive_mutex() { | ||
| } | ||
|
|
||
| void lock() { | ||
| pthread_mutex_lock(&mutex_); | ||
| } | ||
|
|
||
| bool try_lock() { | ||
| return pthread_mutex_trylock(&mutex_); | ||
| } | ||
|
|
||
| void unlock() { | ||
| pthread_mutex_unlock(&mutex_); | ||
| } | ||
|
|
||
| private: | ||
| pthread_mutex_t mutex_ = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; | ||
|
|
||
| DISALLOW_COPY_AND_ASSIGN(recursive_mutex); | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.