Skip to content

Fix putIntoUnackQueueRing function logic for Intercontect interfaces:loss advance method #1986

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

Open
ZTE-EBASE wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −14
Open

Fix putIntoUnackQueueRing function logic for Intercontect interfaces:loss advance method #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
463a551
Fix putIntoUnackQueueRing function logic for Intercontect interfaces:…
Sep 11, 2026
651f37c
Fix putIntoUnackQueueRing function logic for Intercontect interfaces:…
Sep 11, 2026
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
14 changes: 7 additions & 7 deletions contrib/interconnect/udp/ic_udpifc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7027,8 +7027,14 @@ putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64
}
else if (diff < TIMER_SPAN_LOSS)
{
diff = diff < TIMER_SPAN_LOSS ? TIMER_SPAN_LOSS : diff;
diff = TIMER_SPAN_LOSS;
}

idx = (uqr->idx + diff / TIMER_SPAN_LOSS) % UNACK_QUEUE_RING_SLOTS_NUM;

#ifdef AMS_VERBOSE_LOGGING
write_log("PUTTW: curtime " UINT64_FORMAT " now " UINT64_FORMAT " (diff " UINT64_FORMAT ") expTime " UINT64_FORMAT " previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
#endif
}
else
{
Expand All @@ -7055,12 +7061,6 @@ putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64
#endif
}

idx = (uqr->idx + diff / TIMER_SPAN) % UNACK_QUEUE_RING_SLOTS_NUM;

#ifdef AMS_VERBOSE_LOGGING
write_log("PUTTW: curtime " UINT64_FORMAT " now " UINT64_FORMAT " (diff " UINT64_FORMAT ") expTime " UINT64_FORMAT " previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
#endif

buf->unackQueueRingSlot = idx;
icBufferListAppend(&unack_queue_ring.slots[idx], buf);
}
Expand Down
14 changes: 7 additions & 7 deletions contrib/udp2/ic_common/udp2/ic_udp2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3049,8 +3049,14 @@ putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64
}
else if (diff < TIMER_SPAN_LOSS)
{
diff = diff < TIMER_SPAN_LOSS ? TIMER_SPAN_LOSS : diff;
diff = TIMER_SPAN_LOSS;
}

idx = (uqr->idx + diff / TIMER_SPAN_LOSS) % UNACK_QUEUE_RING_SLOTS_NUM;

#ifdef AMS_VERBOSE_LOGGING
LOG(INFO, "PUTTW: curtime %lu now %lu (diff %lu) expTime %lu previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
#endif
}
else
{
Expand All @@ -3077,12 +3083,6 @@ putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64
#endif
}

idx = (uqr->idx + diff / TIMER_SPAN) % UNACK_QUEUE_RING_SLOTS_NUM;

#ifdef AMS_VERBOSE_LOGGING
LOG(INFO, "PUTTW: curtime %lu now %lu (diff %lu) expTime %lu previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
#endif

buf->unackQueueRingSlot = idx;
unack_queue_ring.slots[idx].append(buf);
}
Expand Down
Loading