FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

quic: cache the timestamp on send and receive · nodejs/node@53b05e2 · GitHub

/ node Public

Commit 53b05e2

Browse files
jasnell
authored and
aduh95
committed
quic: cache the timestamp on send and receive
Signed-off-by: James M Snell <jasnell@gmail.com> Assisted-by: Opencode:Opus 4.6 PR-URL: #63267 Backport-PR-URL: #64675 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 1592a11 commit 53b05e2

4 files changed

Lines changed: 39 additions & 15 deletions

File tree

‎src/quic/application.cc‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ void Session::Application::ReceiveStreamReset(Stream* stream,
239239
// < 0 (other): fatal error, session already closed
240240
ssize_t Session::Application::TryWritePendingDatagram(PathStorage* path,
241241
uint8_t* dest,
242-
size_t destlen) {
242+
size_t destlen,
243+
uint64_t ts) {
243244
CHECK(session_->HasPendingDatagrams());
244245
auto max_attempts = session_->config().options.max_datagram_send_attempts;
245246

@@ -275,7 +276,7 @@ ssize_t Session::Application::TryWritePendingDatagram(PathStorage* path,
275276
dg.id,
276277
&dgvec,
277278
1,
278-
uv_hrtime());
279+
ts);
279280

280281
if (accepted) {
281282
// Nice, the datagram was accepted!
@@ -338,6 +339,13 @@ void Session::Application::SendPendingData() {
338339
// call is dynamically capped by ngtcp2_conn_get_send_quantum().
339340
static constexpr size_t kMaxPackets = 64;
340341
Debug(session_, "Application sending pending data");
342+
// Cache the timestamp once for the entire send loop. ngtcp2 does not
343+
// require nanosecond-accurate monotonicity within a single burst —
344+
// a single timestamp per SendPendingData call is what other QUIC
345+
// implementations use (e.g., quiche, msquic). When kernel-level
346+
// packet pacing becomes available via libuv, this timestamp becomes
347+
// the base for computing per-packet transmit timestamps.
348+
const uint64_t ts = uv_hrtime();
341349
PathStorage path;
342350
StreamData stream_data;
343351

@@ -441,7 +449,8 @@ void Session::Application::SendPendingData() {
441449
// Awesome, let's write our packet!
442450
PacketInfo pi;
443451
ssize_t nwrite = WriteVStream(
444-
&path, &pi, packet->data(), &ndatalen, packet->length(), stream_data);
452+
&path, &pi, packet->data(), &ndatalen, packet->length(),
453+
stream_data, ts);
445454

446455
// When ndatalen is > 0, that's our indication that stream data was accepted
447456
// in to the packet. Yay!
@@ -528,7 +537,7 @@ void Session::Application::SendPendingData() {
528537
// if there is one. Otherwise just loop around and keep going.
529538
if (session_->HasPendingDatagrams()) {
530539
auto result = TryWritePendingDatagram(
531-
&path, packet->data(), packet->length());
540+
&path, packet->data(), packet->length(), ts);
532541
// When result is 0, either the datagram was congestion controlled,
533542
// didn't fit in the packet, or was abandoned. Skip and continue.
534543

@@ -590,7 +599,7 @@ void Session::Application::SendPendingData() {
590599
return session_->Close(CloseMethod::SILENT);
591600
}
592601
auto result =
593-
TryWritePendingDatagram(&path, packet->data(), packet->length());
602+
TryWritePendingDatagram(&path, packet->data(), packet->length(), ts);
594603
if (result > 0) {
595604
Debug(session_, "Sending datagram packet with %zd bytes", result);
596605
enqueue_packet(packet, static_cast<size_t>(result), PacketInfo());
@@ -610,7 +619,8 @@ ssize_t Session::Application::WriteVStream(PathStorage* path,
610619
uint8_t* dest,
611620
ssize_t* ndatalen,
612621
size_t max_packet_size,
613-
const StreamData& stream_data) {
622+
const StreamData& stream_data,
623+
uint64_t ts) {
614624
DCHECK_LE(stream_data.count, kMaxVectorCount);
615625
uint32_t flags = NGTCP2_WRITE_STREAM_FLAG_MORE;
616626
if (stream_data.fin) flags |= NGTCP2_WRITE_STREAM_FLAG_FIN;
@@ -627,7 +637,7 @@ ssize_t Session::Application::WriteVStream(PathStorage* path,
627637
stream_data.id,
628638
stream_data,
629639
stream_data.count,
630-
uv_hrtime());
640+
ts);
631641
}
632642

633643
// ============================================================================

‎src/quic/application.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ class Session::Application : public MemoryRetainer {
267267
// the datagram is either congestion limited or was abandoned
268268
ssize_t TryWritePendingDatagram(PathStorage* path,
269269
uint8_t* dest,
270-
size_t destlen);
270+
size_t destlen,
271+
uint64_t ts);
271272

272273
// Write the given stream_data into the buffer. The PacketInfo out-param
273274
// is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
@@ -277,7 +278,8 @@ class Session::Application : public MemoryRetainer {
277278
uint8_t* buf,
278279
ssize_t* ndatalen,
279280
size_t max_packet_size,
280-
const StreamData& stream_data);
281+
const StreamData& stream_data,
282+
uint64_t ts);
281283

282284
Session* session_ = nullptr;
283285
};

‎src/quic/session.cc‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,20 +2112,23 @@ void Session::SetLastError(QuicError&& error) {
21122112
bool Session::Receive(Store&& store,
21132113
const SocketAddress& local_address,
21142114
const SocketAddress& remote_address,
2115-
const PacketInfo& pkt_info) {
2115+
const PacketInfo& pkt_info,
2116+
uint64_t ts) {
21162117
// Convenience wrapper: reads the packet and immediately triggers
21172118
// SendPendingData. Used by paths that need an immediate response
21182119
// (e.g., Endpoint::Connect for client Initial packets).
21192120
// The hot receive path uses ReadPacket() directly with deferred
21202121
// flush via BindingData's uv_check callback.
21212122
SendPendingDataScope send_scope(this);
2122-
return ReadPacket(std::move(store), local_address, remote_address, pkt_info);
2123+
return ReadPacket(
2124+
std::move(store), local_address, remote_address, pkt_info, ts);
21232125
}
21242126

21252127
bool Session::ReadPacket(Store&& store,
21262128
const SocketAddress& local_address,
21272129
const SocketAddress& remote_address,
2128-
const PacketInfo& pkt_info) {
2130+
const PacketInfo& pkt_info,
2131+
uint64_t ts) {
21292132
DCHECK(!is_destroyed());
21302133
impl_->remote_address_ = remote_address;
21312134

@@ -2151,8 +2154,12 @@ bool Session::ReadPacket(Store&& store,
21512154
// When libuv gains per-packet ECN reporting, the caller should
21522155
// populate pkt_info from the receive metadata before calling
21532156
// ReadPacket().
2157+
// When ts is 0 (the default), call uv_hrtime() here. The batched
2158+
// receive path caches a timestamp and passes it to all ReadPacket()
2159+
// calls in the same I/O burst.
2160+
if (ts == 0) ts = uv_hrtime();
21542161
err = ngtcp2_conn_read_pkt(
2155-
*this, &path, pkt_info, vec.base, vec.len, uv_hrtime());
2162+
*this, &path, pkt_info, vec.base, vec.len, ts);
21562163
}
21572164
if (is_destroyed()) return false;
21582165

‎src/quic/session.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
356356
bool Receive(Store&& store,
357357
const SocketAddress& local_address,
358358
const SocketAddress& remote_address,
359-
const PacketInfo& pkt_info = PacketInfo());
359+
const PacketInfo& pkt_info = PacketInfo(),
360+
uint64_t ts = 0);
360361

361362
// ReadPacket processes a single inbound packet through ngtcp2 without
362363
// triggering SendPendingData. This is the building block for batched
@@ -366,10 +367,14 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
366367
// Receive() is kept as a convenience wrapper that calls ReadPacket()
367368
// then triggers SendPendingData (for paths like Connect that need
368369
// immediate response).
370+
// When ts is 0 (the default), uv_hrtime() is called internally.
371+
// The batched receive path caches a timestamp and passes it to all
372+
// ReadPacket() calls in the same I/O burst.
369373
bool ReadPacket(Store&& store,
370374
const SocketAddress& local_address,
371375
const SocketAddress& remote_address,
372-
const PacketInfo& pkt_info = PacketInfo());
376+
const PacketInfo& pkt_info = PacketInfo(),
377+
uint64_t ts = 0);
373378

374379
// Called by BindingData's flush callback to trigger SendPendingData
375380
// on this session. Encapsulates the application() access so that

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL