Skip to content

doc: clarify O_EXCL text in fs.md #34096

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

Merged
Trott merged 25 commits into from
Jul 1, 2020
Merged

doc: clarify O_EXCL text in fs.md #34096

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b327d33
n-api: add version to wasm registration
devsnek Jun 25, 2020
95eecd5
doc: improve paragraph in esm.md
Trott Jun 26, 2020
90d5f35
doc: make minor improvements to paragraph in child_process.md
Trott Jun 26, 2020
da8a1ef
zlib: remove redundant variable in zlibBufferOnEnd
puzpuzpuz Jun 26, 2020
9e135ac
wasi: add reactor support
devsnek Jun 25, 2020
c23d2fd
src: allow embedders to disable esm loader
codebytere Jun 26, 2020
cb673e1
2020-06-30, Version 12.18.2 'Erbium' (LTS)
BethGriggs Jun 26, 2020
b613933
test: update test-child-process-spawn-loop for Python 3
richardlau Jun 26, 2020
68634d2
quic: remove redundant cast
gengjiawen Jun 27, 2020
204f20f
quic: minor cleanups in quic_buffer
jasnell Jun 26, 2020
8f4b4f2
stream: destroy wrapped streams on error
ronag Jun 28, 2020
312a4f3
net: fix bufferSize
ronag Jun 27, 2020
0edeeec
net: doc deprecate bufferSize
ronag Jun 28, 2020
eb8fc2b
2020-06-30, Version 14.5.0 (Current)
codebytere Jun 28, 2020
e20beaf
meta: fixup CODEOWNERS so it hopefully works
jasnell Jul 1, 2020
73a51bb
quic: cleanups in JS API
jasnell Jun 27, 2020
d603418
quic: cleanups for QuicSocket
jasnell Jun 30, 2020
def8e76
quic: fixup set_final_size
jasnell Jun 30, 2020
3bae2d5
quic: consolidate onSessionClose and onSessionSilentClose
jasnell Jun 30, 2020
b1fab88
quic: remove unused callback function
jasnell Jun 30, 2020
2afc1ab
quic: fixup constant exports, export all protocol error codes
jasnell Jun 30, 2020
b5fe31e
quic: avoid using private JS fields for now
jasnell Jun 30, 2020
31d6d9d
quic: reduce duplication of code
jasnell Jun 30, 2020
584fc7e
doc: clarify ambiguous rdev description
Trott Jun 28, 2020
8ff8c68
doc: clarify O_EXCL text in fs.md
Trott Jun 28, 2020
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
Prev Previous commit
Next Next commit
quic: reduce duplication of code 
PR-URL: #34137
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
  • Loading branch information
@jasnell
jasnell committed Jul 1, 2020
commit 31d6d9d0f7cc8e39bc183d66961ec09033a621c2
131 changes: 53 additions & 78 deletions lib/internal/quic/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ const {
IDX_QUIC_SESSION_STATS_STREAMS_OUT_COUNT,
IDX_QUIC_SESSION_STATS_KEYUPDATE_COUNT,
IDX_QUIC_SESSION_STATS_LOSS_RETRANSMIT_COUNT,
IDX_QUIC_SESSION_STATS_HANDSHAKE_COMPLETED_AT,
IDX_QUIC_SESSION_STATS_ACK_DELAY_RETRANSMIT_COUNT,
IDX_QUIC_SESSION_STATS_MAX_BYTES_IN_FLIGHT,
IDX_QUIC_SESSION_STATS_BLOCK_COUNT,
Expand Down Expand Up @@ -625,6 +626,13 @@ function onRemoveListener(event) {
toggleListeners(this[kHandle], event, false);
}

function getStats(obj, idx) {
const stats = obj[kHandle]?.stats || obj[kInternalState].stats;
// If stats is undefined at this point, it's just a bug
assert(stats);
return stats[idx];
}

// QuicEndpoint wraps a UDP socket and is owned
// by a QuicSocket. It does not exist independently
// of the QuicSocket.
Expand Down Expand Up @@ -1524,77 +1532,65 @@ class QuicSocket extends EventEmitter {
this[kHandle].setServerBusy(on);
}

get serverBusy() {
return this[kInternalState].serverBusy;
}

get duration() {
// TODO(@jasnell): If the object is destroyed, it should
// use a fixed duration rather than calculating from now
const now = process.hrtime.bigint();
const stats = this[kInternalState].stats || this[kHandle].stats;
return now - stats[IDX_QUIC_SOCKET_STATS_CREATED_AT];
return process.hrtime.bigint() -
getStats(this, IDX_QUIC_SOCKET_STATS_CREATED_AT);
}

get boundDuration() {
// TODO(@jasnell): If the object is destroyed, it should
// use a fixed duration rather than calculating from now
const now = process.hrtime.bigint();
const stats = this[kInternalState].stats || this[kHandle].stats;
return now - stats[IDX_QUIC_SOCKET_STATS_BOUND_AT];
return process.hrtime.bigint() -
getStats(this, IDX_QUIC_SOCKET_STATS_BOUND_AT);
}

get listenDuration() {
// TODO(@jasnell): If the object is destroyed, it should
// use a fixed duration rather than calculating from now
const now = process.hrtime.bigint();
const stats = this[kInternalState].stats || this[kHandle].stats;
return now - stats[IDX_QUIC_SOCKET_STATS_LISTEN_AT];
return process.hrtime.bigint() -
getStats(this, IDX_QUIC_SOCKET_STATS_LISTEN_AT);
}

get bytesReceived() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_BYTES_RECEIVED];
return getStats(this, IDX_QUIC_SOCKET_STATS_BYTES_RECEIVED);
}

get bytesSent() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_BYTES_SENT];
return getStats(this, IDX_QUIC_SOCKET_STATS_BYTES_SENT);
}

get packetsReceived() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_PACKETS_RECEIVED];
return getStats(this, IDX_QUIC_SOCKET_STATS_PACKETS_RECEIVED);
}

get packetsSent() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_PACKETS_SENT];
return getStats(this, IDX_QUIC_SOCKET_STATS_PACKETS_SENT);
}

get packetsIgnored() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_PACKETS_IGNORED];
}

get serverBusy() {
return this[kInternalState].serverBusy;
return getStats(this, IDX_QUIC_SOCKET_STATS_PACKETS_IGNORED);
}

get serverSessions() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_SERVER_SESSIONS];
return getStats(this, IDX_QUIC_SOCKET_STATS_SERVER_SESSIONS);
}

get clientSessions() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_CLIENT_SESSIONS];
return getStats(this, IDX_QUIC_SOCKET_STATS_CLIENT_SESSIONS);
}

get statelessResetCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_STATELESS_RESET_COUNT];
return getStats(this, IDX_QUIC_SOCKET_STATS_STATELESS_RESET_COUNT);
}

get serverBusyCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SOCKET_STATS_SERVER_BUSY_COUNT];
return getStats(this, IDX_QUIC_SOCKET_STATS_SERVER_BUSY_COUNT);
}

// Diagnostic packet loss is a testing mechanism that allows simulating
Expand Down Expand Up @@ -2183,82 +2179,68 @@ class QuicSession extends EventEmitter {
}

get duration() {
const now = process.hrtime.bigint();
const stats = this[kInternalState].stats || this[kHandle].stats;
return now - stats[IDX_QUIC_SESSION_STATS_CREATED_AT];
return process.hrtime.bigint() -
getStats(this, IDX_QUIC_SESSION_STATS_CREATED_AT);
}

get handshakeDuration() {
const stats = this[kInternalState].stats || this[kHandle].stats;
const end =
this.handshakeComplete ?
stats[4] : process.hrtime.bigint();
return end - stats[IDX_QUIC_SESSION_STATS_HANDSHAKE_START_AT];
getStats(this, IDX_QUIC_SESSION_STATS_HANDSHAKE_COMPLETED_AT) :
process.hrtime.bigint();
return end - getStats(this, IDX_QUIC_SESSION_STATS_HANDSHAKE_START_AT);
}

get bytesReceived() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_BYTES_RECEIVED];
return getStats(this, IDX_QUIC_SESSION_STATS_BYTES_RECEIVED);
}

get bytesSent() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_BYTES_SENT];
return getStats(this, IDX_QUIC_SESSION_STATS_BYTES_SENT);
}

get bidiStreamCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_BIDI_STREAM_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_BIDI_STREAM_COUNT);
}

get uniStreamCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_UNI_STREAM_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_UNI_STREAM_COUNT);
}

get maxInFlightBytes() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_MAX_BYTES_IN_FLIGHT];
return getStats(this, IDX_QUIC_SESSION_STATS_MAX_BYTES_IN_FLIGHT);
}

get lossRetransmitCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_LOSS_RETRANSMIT_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_LOSS_RETRANSMIT_COUNT);
}

get ackDelayRetransmitCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_ACK_DELAY_RETRANSMIT_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_ACK_DELAY_RETRANSMIT_COUNT);
}

get peerInitiatedStreamCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_STREAMS_IN_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_STREAMS_IN_COUNT);
}

get selfInitiatedStreamCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_STREAMS_OUT_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_STREAMS_OUT_COUNT);
}

get keyUpdateCount() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_KEYUPDATE_COUNT];
return getStats(this, IDX_QUIC_SESSION_STATS_KEYUPDATE_COUNT);
}

get minRTT() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_MIN_RTT];
return getStats(this, IDX_QUIC_SESSION_STATS_MIN_RTT);
}

get latestRTT() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_LATEST_RTT];
return getStats(this, IDX_QUIC_SESSION_STATS_LATEST_RTT);
}

get smoothedRTT() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_SESSION_STATS_SMOOTHED_RTT];
return getStats(this, IDX_QUIC_SESSION_STATS_SMOOTHED_RTT);
}

updateKey() {
Expand Down Expand Up @@ -3176,39 +3158,32 @@ class QuicStream extends Duplex {
}

get duration() {
const now = process.hrtime.bigint();
const stats = this[kInternalState].stats || this[kHandle].stats;
return now - stats[IDX_QUIC_STREAM_STATS_CREATED_AT];
return process.hrtime.bigint() -
getStats(this, IDX_QUIC_STREAM_STATS_CREATED_AT);
}

get bytesReceived() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_STREAM_STATS_BYTES_RECEIVED];
return getStats(this, IDX_QUIC_STREAM_STATS_BYTES_RECEIVED);
}

get bytesSent() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_STREAM_STATS_BYTES_SENT];
return getStats(this, IDX_QUIC_STREAM_STATS_BYTES_SENT);
}

get maxExtendedOffset() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_STREAM_STATS_MAX_OFFSET];
return getStats(this, IDX_QUIC_STREAM_STATS_MAX_OFFSET);
}

get finalSize() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_STREAM_STATS_FINAL_SIZE];
return getStats(this, IDX_QUIC_STREAM_STATS_FINAL_SIZE);
}

get maxAcknowledgedOffset() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_STREAM_STATS_MAX_OFFSET_ACK];
return getStats(this, IDX_QUIC_STREAM_STATS_MAX_OFFSET_ACK);
}

get maxReceivedOffset() {
const stats = this[kInternalState].stats || this[kHandle].stats;
return stats[IDX_QUIC_STREAM_STATS_MAX_OFFSET_RECV];
return getStats(this, IDX_QUIC_STREAM_STATS_MAX_OFFSET_RECV);
}
}

Expand Down