michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel/mutex: remove object monitoring empty loop macros

Browse source 
There are some remaining code from object monitoring which simply
expands to empty loop macros. Remove them as they are not
functional anyway.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2019-03-27 09:40:00 -07:00 • committed by Kumar Gala
commit 416d94cd30
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kernel/mutex.c
View file

@ -38,10 +38,6 @@
#include <syscall_handler.h>
#include <tracing.h>
#define RECORD_STATE_CHANGE(mutex) do { } while (false)
#define RECORD_CONFLICT(mutex) do { } while (false)
extern struct k_mutex _k_mutex_list_start[];
extern struct k_mutex _k_mutex_list_end[];
@ -131,8 +127,6 @@ int z_impl_k_mutex_lock(struct k_mutex *mutex, s32_t timeout)
if (likely((mutex->lock_count == 0U) || (mutex->owner == _current))) {
RECORD_STATE_CHANGE();
mutex->owner_orig_prio = (mutex->lock_count == 0U) ?
_current->base.prio :
mutex->owner_orig_prio;
@ -150,8 +144,6 @@ int z_impl_k_mutex_lock(struct k_mutex *mutex, s32_t timeout)
return 0;
}
RECORD_CONFLICT();
if (unlikely(timeout == (s32_t)K_NO_WAIT)) {
k_sched_unlock();
sys_trace_end_call(SYS_TRACE_ID_MUTEX_LOCK);
@ -223,9 +215,6 @@ void z_impl_k_mutex_unlock(struct k_mutex *mutex)
sys_trace_void(SYS_TRACE_ID_MUTEX_UNLOCK);
z_sched_lock();
RECORD_STATE_CHANGE();
K_DEBUG("mutex %p lock_count: %d\n", mutex, mutex->lock_count);
if (mutex->lock_count - 1U != 0U) {