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

Squashed 'features/FEATURE_COMMON_PAL/mbed-trace/' changes from b17e969..31e338c 

31e338c Use temp variable in mutex release loop (#52)

git-subtree-dir: features/FEATURE_COMMON_PAL/mbed-trace
git-subtree-split: 31e338c23934491fcb852ee4d2788d34851d01a2
pull/2975/head
Seppo Takalo 2016-10-05 16:09:58 +03:00 committed by Anna Bridge
parent 0bc661e172
commit b12b1bd312
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c
View File

@ -454,10 +454,20 @@ void mbed_vtracef(uint8_t dlevel, const char* grp, const char *fmt, va_list ap)
end: end:
if ( m_trace.mutex_release_f ) { if ( m_trace.mutex_release_f ) {
while (m_trace.mutex_lock_count > 0) { // Store the mutex lock count to temp variable so that it won't get
m_trace.mutex_lock_count--; // clobbered during last loop iteration when mutex gets released
int count = m_trace.mutex_lock_count;
m_trace.mutex_lock_count = 0;
// Since the helper functions (eg. mbed_trace_array) are used like this:
// mbed_tracef(TRACE_LEVEL_INFO, "grp", "%s", mbed_trace_array(some_array))
// The helper function MUST acquire the mutex if it modifies any buffers. However
// it CANNOT unlock the mutex because that would allow another thread to acquire
// the mutex after helper function unlocks it and before mbed_tracef acquires it
// for itself. This means that here we have to unlock the mutex as many times
// as it was acquired by trace function and any possible helper functions.
do {
m_trace.mutex_release_f(); m_trace.mutex_release_f();
} } while (--count > 0);
} }
} }
static void mbed_trace_reset_tmp(void) static void mbed_trace_reset_tmp(void)