Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update trace #2929

Merged
merged 2 commits into from
Oct 7, 2016
Merged

Update trace #2929

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a4b3d1
Squashed 'features/FEATURE_COMMON_PAL/mbed-trace/' changes from b17e9…
Oct 5, 2016
35c4ceb
Update mbed-trace
Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,10 +454,20 @@ void mbed_vtracef(uint8_t dlevel, const char* grp, const char *fmt, va_list ap)

end:
if ( m_trace.mutex_release_f ) {
while (m_trace.mutex_lock_count > 0) {
m_trace.mutex_lock_count--;
// Store the mutex lock count to temp variable so that it won't get
// 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();
}
} while (--count > 0);
}
}
static void mbed_trace_reset_tmp(void)
Expand Down