i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: fix trace build for BufferQueue

Browse Source 
Change-Id: Iab502bdff3da23dff74972e6c480e0784ab3f4dd
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3905
Reviewed-by: Alex von Gluck IV <[email protected]>
This commit is contained in:
Jérôme Duval
2021-05-13 08:01:27 +00:00
parent 745830a01b
commit a939e873ba
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
+22 -18
View File
@@ -60,7 +60,7 @@ BufferQueue::SetMaxBytes(size_t maxBytes)
void void
BufferQueue::SetInitialSequence(tcp_sequence sequence) BufferQueue::SetInitialSequence(tcp_sequence sequence)
{ {
TRACE(("BufferQueue@%p::SetInitialSequence(%lu)\n", this, TRACE(("BufferQueue@%p::SetInitialSequence(%" B_PRIu32 ")\n", this,
sequence.Number())); sequence.Number()));
fFirstSequence = fLastSequence = sequence; fFirstSequence = fLastSequence = sequence;
@@ -78,10 +78,10 @@ BufferQueue::Add(net_buffer *buffer)
void void
BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence) BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
{ {
TRACE(("BufferQueue@%p::Add(buffer %p, size %lu, sequence %lu)\n", TRACE(("BufferQueue@%p::Add(buffer %p, size %" B_PRIu32 ", sequence %"
this, buffer, buffer->size, sequence.Number())); B_PRIu32 ")\n", this, buffer, buffer->size, sequence.Number()));
TRACE((" in: first: %lu, last: %lu, num: %lu, cont: %lu\n", TRACE((" in: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %lu, cont: "
fFirstSequence.Number(), fLastSequence.Number(), fNumBytes, "%lu\n", fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
fContiguousBytes)); fContiguousBytes));
VERIFY(); VERIFY();
@@ -113,9 +113,9 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
fLastSequence = sequence + buffer->size; fLastSequence = sequence + buffer->size;
fNumBytes += buffer->size; fNumBytes += buffer->size;
TRACE((" out0: first: %lu, last: %lu, num: %lu, cont: %lu\n", TRACE((" out0: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %"
fFirstSequence.Number(), fLastSequence.Number(), fNumBytes, B_PRIuSIZE ", cont: %" B_PRIuSIZE "\n", fFirstSequence.Number(),
fContiguousBytes)); fLastSequence.Number(), fNumBytes, fContiguousBytes));
VERIFY(); VERIFY();
return; return;
} }
@@ -191,9 +191,9 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
} }
if (buffer == NULL) { if (buffer == NULL) {
TRACE((" out1: first: %lu, last: %lu, num: %lu, cont: %lu\n", TRACE((" out1: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %"
fFirstSequence.Number(), fLastSequence.Number(), fNumBytes, B_PRIuSIZE ", cont: %" B_PRIuSIZE "\n", fFirstSequence.Number(),
fContiguousBytes)); fLastSequence.Number(), fNumBytes, fContiguousBytes));
VERIFY(); VERIFY();
return; return;
} }
@@ -218,8 +218,8 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
&& fFirstSequence + fContiguousBytes == buffer->sequence); && fFirstSequence + fContiguousBytes == buffer->sequence);
} }
TRACE((" out2: first: %lu, last: %lu, num: %lu, cont: %lu\n", TRACE((" out2: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %lu, cont: "
fFirstSequence.Number(), fLastSequence.Number(), fNumBytes, "%lu\n", fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
fContiguousBytes)); fContiguousBytes));
VERIFY(); VERIFY();
} }
@@ -233,7 +233,7 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
status_t status_t
BufferQueue::RemoveUntil(tcp_sequence sequence) BufferQueue::RemoveUntil(tcp_sequence sequence)
{ {
TRACE(("BufferQueue@%p::RemoveUntil(sequence %lu)\n", this, TRACE(("BufferQueue@%p::RemoveUntil(sequence %" B_PRIu32 ")\n", this,
sequence.Number())); sequence.Number()));
VERIFY(); VERIFY();
@@ -283,7 +283,7 @@ BufferQueue::RemoveUntil(tcp_sequence sequence)
status_t status_t
BufferQueue::Get(net_buffer *buffer, tcp_sequence sequence, size_t bytes) BufferQueue::Get(net_buffer *buffer, tcp_sequence sequence, size_t bytes)
{ {
TRACE(("BufferQueue@%p::Get(sequence %lu, bytes %lu)\n", this, TRACE(("BufferQueue@%p::Get(sequence %" B_PRIu32 ", bytes %lu)\n", this,
sequence.Number(), bytes)); sequence.Number(), bytes));
VERIFY(); VERIFY();
@@ -439,12 +439,15 @@ BufferQueue::SetPushPointer()
int int
BufferQueue::PopulateSackInfo(tcp_sequence sequence, int maxSackCount, tcp_sack* sacks) BufferQueue::PopulateSackInfo(tcp_sequence sequence, int maxSackCount,
tcp_sack* sacks)
{ {
SegmentList::ReverseIterator iterator = fList.GetReverseIterator(); SegmentList::ReverseIterator iterator = fList.GetReverseIterator();
net_buffer* buffer = iterator.Next(); net_buffer* buffer = iterator.Next();
int sackCount = 0; int sackCount = 0;
TRACE(("BufferQueue::PopulateSackInfo() %" B_PRIu32 "\n",
sequence.Number()));
while (buffer != NULL && buffer->sequence > sequence) { while (buffer != NULL && buffer->sequence > sequence) {
if (buffer->sequence + buffer->size < sacks[sackCount].left_edge) { if (buffer->sequence + buffer->size < sacks[sackCount].left_edge) {
if (sackCount + 1 == maxSackCount) if (sackCount + 1 == maxSackCount)
@@ -517,8 +520,9 @@ BufferQueue::Dump() const
SegmentList::ConstIterator iterator = fList.GetIterator(); SegmentList::ConstIterator iterator = fList.GetIterator();
int32 number = 0; int32 number = 0;
while (net_buffer* buffer = iterator.Next()) { while (net_buffer* buffer = iterator.Next()) {
kprintf(" %" B_PRId32 ". buffer %p, sequence %" B_PRIu32 ", size %" kprintf(" %" B_PRId32 ". buffer %p, sequence %" B_PRIu32
B_PRIu32 "\n", ++number, buffer, buffer->sequence, buffer->size); ", size %" B_PRIu32 "\n", ++number, buffer, buffer->sequence,
buffer->size);
} }
} }