ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-01 23:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trace_buffer: fix wrap corner case

Browse Source 
If the functor reading the first entry after wrap-around returned false,
the wrapping was not applied successfully.

genodelabs/genode#4430
This commit is contained in:
Johannes Schlatow 2022-02-17 12:06:12 +01:00 committed by Christian Helmuth
parent 44aefc8777
commit b57ccf3517
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base/include/base/trace/buffer.h
View File

@ -124,6 +124,8 @@ class Genode::Trace::Buffer
public: public:
Entry() : _entry(0) { };
size_t length() const { return _entry->len; } size_t length() const { return _entry->len; }
char const *data() const { return _entry->data; } char const *data() const { return _entry->data; }

7
repos/os/include/trace/trace_buffer.h
View File

@ -76,8 +76,10 @@ class Trace_buffer
/* iterate over all entries that were not processed yet */ /* iterate over all entries that were not processed yet */
for (; wrapped || !entry.last(); entry = _buffer.next(entry)) { for (; wrapped || !entry.last(); entry = _buffer.next(entry)) {
/* if buffer wrapped, we pass the last entry once and continue at first entry */ /* if buffer wrapped, we pass the last entry once and continue at first entry */
bool applied_wrap = false;
if (wrapped && entry.last()) { if (wrapped && entry.last()) {
wrapped = false; wrapped = false;
applied_wrap = true;
entry = _buffer.first(); entry = _buffer.first();
if (entry.last()) { if (entry.last()) {
new_curr = entry; new_curr = entry;
@ -89,8 +91,11 @@ class Trace_buffer
continue; continue;
} }
if (!functor(entry)) if (!functor(entry)) {
if (applied_wrap)
new_curr = Trace::Buffer::Entry();
break; break;
}
new_curr = entry; new_curr = entry;
} }