ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12983 from kjbracey-arm/mutexcount 

Mutex::unlock - decrement _count inside lock
pull/13069/head
Martin Kojtal 2020-06-04 14:39:28 +02:00 committed by GitHub
parent ab439624ed b52a3b3120
commit 0a365b3ae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtos/source/Mutex.cpp
View File

@ -123,10 +123,12 @@ bool Mutex::trylock_until(Kernel::Clock::time_point abs_time)
void Mutex::unlock() void Mutex::unlock()
{ {
// Count must be adjusted inside the lock. This would leave it incorrect
// on failure, but it only is used for an assert in ConditionVariable,
// and a mutex release failure means MBED_ERROR anyway.
_count--;
osStatus status = osMutexRelease(_id); osStatus status = osMutexRelease(_id);
if (osOK == status) {
_count--;
}
if (status != osOK && !mbed_get_error_in_progress()) { if (status != osOK && !mbed_get_error_in_progress()) {
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_KERNEL, MBED_ERROR_CODE_MUTEX_UNLOCK_FAILED), "Mutex unlock failed", status); MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_KERNEL, MBED_ERROR_CODE_MUTEX_UNLOCK_FAILED), "Mutex unlock failed", status);