Skip to content
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

net: use kHandle symbol for accessing native handle #26491

Closed
wants to merge 1 commit into from
Closed

net: use kHandle symbol for accessing native handle #26491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ const {
updateSettingsBuffer
} = require('internal/http2/util');
const {
createWriteWrap,
writeGeneric,
writevGeneric,
onStreamRead,
kAfterAsyncWrite,
kMaybeDestroy,
kUpdateTimer,
kHandle,
kSession,
setStreamTimeout
} = require('internal/stream_base_commons');
Expand Down Expand Up @@ -149,7 +149,6 @@ const TLSServer = tls.Server;
const kAlpnProtocol = Symbol('alpnProtocol');
const kAuthority = Symbol('authority');
const kEncrypted = Symbol('encrypted');
const kHandle = Symbol('handle');
const kID = Symbol('id');
const kInit = Symbol('init');
const kInfoHeaders = Symbol('sent-info-headers');
Expand Down Expand Up @@ -1795,13 +1794,12 @@ class Http2Stream extends Duplex {
if (!this.headersSent)
this[kProceed]();

const req = createWriteWrap(this[kHandle]);
req.stream = this[kID];
let req;

if (writev)
writevGeneric(this, req, data, cb);
req = writevGeneric(this, data, cb);
else
writeGeneric(this, req, data, encoding, cb);
req = writeGeneric(this, data, encoding, cb);

trackWriteState(this, req.bytes);
}
Expand Down
12 changes: 9 additions & 3 deletions lib/internal/stream_base_commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ const {
const kMaybeDestroy = Symbol('kMaybeDestroy');
const kUpdateTimer = Symbol('kUpdateTimer');
const kAfterAsyncWrite = Symbol('kAfterAsyncWrite');
const kSession = Symbol('session');
const kHandle = Symbol('kHandle');
const kSession = Symbol('kSession');

function handleWriteReq(req, data, encoding) {
const { handle } = req;
Expand Down Expand Up @@ -98,7 +99,8 @@ function createWriteWrap(handle) {
return req;
}

function writevGeneric(self, req, data, cb) {
function writevGeneric(self, data, cb) {
const req = createWriteWrap(self[kHandle]);
var allBuffers = data.allBuffers;
var chunks;
var i;
Expand All @@ -120,12 +122,15 @@ function writevGeneric(self, req, data, cb) {
if (err === 0) req._chunks = chunks;

afterWriteDispatched(self, req, err, cb);
return req;
}

function writeGeneric(self, req, data, encoding, cb) {
function writeGeneric(self, data, encoding, cb) {
const req = createWriteWrap(self[kHandle]);
var err = handleWriteReq(req, data, encoding);

afterWriteDispatched(self, req, err, cb);
return req;
}

function afterWriteDispatched(self, req, err, cb) {
Expand Down Expand Up @@ -229,6 +234,7 @@ module.exports = {
kAfterAsyncWrite,
kMaybeDestroy,
kUpdateTimer,
kHandle,
kSession,
setStreamTimeout
};
15 changes: 10 additions & 5 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ const {
symbols: { async_id_symbol, owner_symbol }
} = require('internal/async_hooks');
const {
createWriteWrap,
writevGeneric,
writeGeneric,
onStreamRead,
kAfterAsyncWrite,
kHandle,
kUpdateTimer,
setStreamTimeout
} = require('internal/stream_base_commons');
Expand Down Expand Up @@ -233,7 +233,7 @@ function Socket(options) {
// probably be supplied by async_hooks.
this[async_id_symbol] = -1;
this._hadError = false;
this._handle = null;
this[kHandle] = null;
this._parent = null;
this._host = null;
this[kLastWriteQueueSize] = 0;
Expand Down Expand Up @@ -689,11 +689,11 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {

this._unrefTimer();

var req = createWriteWrap(this._handle);
let req;
if (writev)
writevGeneric(this, req, data, cb);
req = writevGeneric(this, data, cb);
else
writeGeneric(this, req, data, encoding, cb);
req = writeGeneric(this, data, encoding, cb);
if (req.async)
this[kLastWriteQueueSize] = req.bytes;
};
Expand Down Expand Up @@ -1584,6 +1584,11 @@ Object.defineProperty(TCP.prototype, 'owner', {
set(v) { return this[owner_symbol] = v; }
});

Object.defineProperty(Socket.prototype, '_handle', {
get() { return this[kHandle]; },
set(v) { return this[kHandle] = v; }
});


Server.prototype.listenFD = internalUtil.deprecate(function(fd, type) {
return this.listen({ fd: fd });
Expand Down