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

trace_logger: be aware of trace-buffer wraps

Browse Source 
Issue #2735

Co-authored-by: Martin Stein <martin.stein@genode-labs.com>
This commit is contained in:
Johannes Schlatow
2018-04-10 16:12:01 +02:00
committed by Christian Helmuth
parent 9fc3344ee8
commit b47bf81b73
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repos/os/src/app/trace_logger/trace_buffer.h
View File

@ -26,7 +26,8 @@ class Trace_buffer
private: private:
Genode::Trace::Buffer &_buffer; Genode::Trace::Buffer &_buffer;
Genode::Trace::Buffer::Entry _curr { _buffer.first() }; Genode::Trace::Buffer::Entry _curr { _buffer.first() };
unsigned _wrapped_count { 0 };
public: public:
@ -40,15 +41,27 @@ class Trace_buffer
{ {
using namespace Genode; using namespace Genode;
bool wrapped = _buffer.wrapped() != _wrapped_count;
if (wrapped)
_wrapped_count = _buffer.wrapped();
/* initialize _curr if _buffer was empty until now */ /* initialize _curr if _buffer was empty until now */
if (_curr.last()) if (_curr.last())
_curr = _buffer.first(); _curr = _buffer.first();
/* iterate over all entries that were not processed yet */ /* iterate over all entries that were not processed yet */
Trace::Buffer::Entry e1 = _curr; Trace::Buffer::Entry e1 = _curr;
for (Trace::Buffer::Entry e2 = _curr; !e2.last(); for (Trace::Buffer::Entry e2 = _curr; wrapped || !e2.last();
e2 = _buffer.next(e2)) e2 = _buffer.next(e2))
{ {
/* if buffer wrapped, we pass the last entry once and continue at first entry */
if (wrapped && e2.last()) {
wrapped = false;
e2 = _buffer.first();
if (e2.last())
break;
}
e1 = e2; e1 = e2;
functor(e1); functor(e1);
} }