Skip to content

Restore original, 2018 mtrace_event(atomic) spin lock logic #4246

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 3 commits into from
May 27, 2021
Merged

Restore original, 2018 mtrace_event(atomic) spin lock logic #4246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c3fb79
logger: don't "return" when failing in the main loop, break instead
marc-hb May 10, 2021
233201e
logger: print the value of a negative DELTA when there is one
marc-hb May 26, 2021
9810ffd
Restore original, 2018 mtrace_event(atomic) spin lock logic
marc-hb May 26, 2021
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
4 changes: 2 additions & 2 deletions src/trace/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ static void vatrace_log(bool send_atomic, uint32_t log_entry, const struct tr_ct
#if CONFIG_TRACEM
/* send event by mail box too. */
if (send_atomic) {
spin_lock_irq(&trace->lock, flags);
mtrace_event((const char *)data, MESSAGE_SIZE(arg_count));
spin_unlock_irq(&trace->lock, flags);
} else {
spin_lock_irq(&trace->lock, flags);
mtrace_event((const char *)data, MESSAGE_SIZE(arg_count));
spin_unlock_irq(&trace->lock, flags);
}
#else
/* send event by mail box if level is LOG_LEVEL_CRITICAL. */
Expand Down
8 changes: 5 additions & 3 deletions tools/logger/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,8 @@ static void print_entry_params(const struct log_entry_header *dma_log,

if (dma_log->timestamp < last_timestamp) {
fprintf(out_fd,
"\n\t\t --- negative DELTA: wrap, IPC_TRACE, other? ---\n\n");
"\n\t\t --- negative DELTA = %.3f us: wrap, IPC_TRACE, other? ---\n\n",
-to_usecs(last_timestamp - dma_log->timestamp));
entry_number = 1;
}

Expand Down Expand Up @@ -836,7 +837,7 @@ static int logger_read(void)
log_err("in %s(), fread(..., %s) failed: %s(%d)\n",
__func__, global_config->in_file,
strerror(-ret), ret);
return ret;
break;
}
/* for trace mode, try to reopen */
if (global_config->trace) {
Expand All @@ -851,7 +852,8 @@ static int logger_read(void)
log_err("in %s(), freopen(..., %s) failed: %s(%d)\n",
__func__, global_config->in_file,
strerror(errno), errno);
return -errno;
ret = -errno;
break;
}
} else {
/* EOF */
Expand Down