Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 1bbf743

Browse files
chakrabotchakrabot
committed
meta: merge node/master into node-chakracore/master
Merge 83d44be as of 2018-03-30 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: chakrabot <[email protected]>
2 parents 1fc5478 + 83d44be commit 1bbf743

24 files changed

Lines changed: 559 additions & 298 deletions

‎CHANGELOG.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ release.
3131
</tr>
3232
<tr>
3333
<td valign="top">
34-
<b><a href="doc/changelogs/CHANGELOG_V9.md#9.10.0">9.10.0</a></b><br/>
34+
<b><a href="doc/changelogs/CHANGELOG_V9.md#9.10.1">9.10.1</a></b><br/>
35+
<a href="doc/changelogs/CHANGELOG_V9.md#9.10.0">9.10.0</a><br/>
3536
<a href="doc/changelogs/CHANGELOG_V9.md#9.9.0">9.9.0</a><br/>
3637
<a href="doc/changelogs/CHANGELOG_V9.md#9.8.0">9.8.0</a><br/>
3738
<a href="doc/changelogs/CHANGELOG_V9.md#9.7.1">9.7.1</a><br/>
@@ -47,7 +48,8 @@ release.
4748
<a href="doc/changelogs/CHANGELOG_V9.md#9.0.0">9.0.0</a><br/>
4849
</td>
4950
<td valign="top">
50-
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.11.0">8.11.0</a></b><br/>
51+
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.11.1">8.11.1</a></b><br/>
52+
<a href="doc/changelogs/CHANGELOG_V8.md#8.11.0">8.11.0</a><br/>
5153
<a href="doc/changelogs/CHANGELOG_V8.md#8.10.0">8.10.0</a><br/>
5254
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.4">8.9.4</a><br/>
5355
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.3">8.9.3</a><br/>
@@ -71,7 +73,8 @@ release.
7173
<a href="doc/changelogs/CHANGELOG_V8.md#8.0.0">8.0.0</a><br/>
7274
</td>
7375
<td valign="top">
74-
<b><a href="doc/changelogs/CHANGELOG_V6.md#6.14.0">6.14.0</a></b><br/>
76+
<b><a href="doc/changelogs/CHANGELOG_V6.md#6.14.1">6.14.1</a></b><br/>
77+
<a href="doc/changelogs/CHANGELOG_V6.md#6.14.0">6.14.0</a><br/>
7578
<a href="doc/changelogs/CHANGELOG_V6.md#6.13.1">6.13.1</a><br/>
7679
<a href="doc/changelogs/CHANGELOG_V6.md#6.13.0">6.13.0</a><br/>
7780
<a href="doc/changelogs/CHANGELOG_V6.md#6.12.3">6.12.3</a><br/>
@@ -109,7 +112,8 @@ release.
109112
<a href="doc/changelogs/CHANGELOG_V6.md#6.0.0">6.0.0</a><br/>
110113
</td>
111114
<td valign="top">
112-
<b><a href="doc/changelogs/CHANGELOG_V4.md#4.9.0">4.9.0</a></b><br/>
115+
<b><a href="doc/changelogs/CHANGELOG_V4.md#4.9.1">4.9.1</a></b><br/>
116+
<a href="doc/changelogs/CHANGELOG_V4.md#4.9.0">4.9.0</a><br/>
113117
<a href="doc/changelogs/CHANGELOG_V4.md#4.8.7">4.8.7</a><br/>
114118
<a href="doc/changelogs/CHANGELOG_V4.md#4.8.6">4.8.6</a><br/>
115119
<a href="doc/changelogs/CHANGELOG_V4.md#4.8.5">4.8.5</a><br/>

‎doc/api/buffer.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,8 @@ changes:
149149
description: Removed the deprecated `raw` and `raws` encodings.
150150
-->
151151

152-
`Buffer` instances are commonly used to represent sequences of encoded characters
153-
such as UTF-8, UCS2, Base64, or even Hex-encoded data. It is possible to
154-
convert back and forth between `Buffer` instances and ordinary JavaScript strings
155-
by using an explicit character encoding.
152+
When string data is stored in or extracted out of a `Buffer` instance, a
153+
character encoding may be specified.
156154

157155
```js
158156
const buf = Buffer.from('hello world', 'ascii');
@@ -161,6 +159,11 @@ console.log(buf.toString('hex'));
161159
// Prints: 68656c6c6f20776f726c64
162160
console.log(buf.toString('base64'));
163161
// Prints: aGVsbG8gd29ybGQ=
162+
163+
console.log(Buffer.from('fhqwhgads', 'ascii'));
164+
// Prints: <Buffer 66 68 71 77 68 67 61 64 73>
165+
console.log(Buffer.from('fhqwhgads', 'ucs2'));
166+
// Prints: <Buffer 66 00 68 00 71 00 77 00 68 00 67 00 61 00 64 00 73 00>
164167
```
165168

166169
The character encodings currently supported by Node.js include:

‎doc/changelogs/CHANGELOG_V4.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</tr>
1111
<tr>
1212
<td valign="top">
13+
<a href="#4.9.1">4.9.1</a><br/>
1314
<a href="#4.9.0">4.9.0</a><br/>
1415
<a href="#4.8.7">4.8.7</a><br/>
1516
<a href="#4.8.6">4.8.6</a><br/>
@@ -71,6 +72,18 @@
7172
[Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
7273
will be supported actively until April 2017 and maintained until April 2018.
7374

75+
<a id="4.9.1"></a>
76+
## 2018-03-29, Version 4.9.1 'Argon' (Maintenance), @MylesBorins
77+
78+
### Notable Changes
79+
80+
No additional commits.
81+
82+
Due to incorrect staging of the upgrade to the GCC 4.9.X compiler, the latest releases for PPC little
83+
endian were built using GCC 4.9.X instead of GCC 4.8.X. This caused an ABI breakage on PPCLE based
84+
environments. This has been fixed in our infrastructure and we are doing this release to ensure that
85+
the hosted binaries are adhering to our platform support contract.
86+
7487
<a id="4.9.0"></a>
7588
## 2018-03-28, Version 4.9.0 'Argon' (Maintenance), @MylesBorins
7689

‎doc/changelogs/CHANGELOG_V6.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</tr>
1111
<tr>
1212
<td valign="top">
13+
<a href="#6.14.1">6.14.1</a><br/>
1314
<a href="#6.14.0">6.14.0</a><br/>
1415
<a href="#6.13.1">6.13.1</a><br/>
1516
<a href="#6.13.0">6.13.0</a><br/>
@@ -67,6 +68,18 @@
6768
[Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
6869
will be supported actively until April 2018 and maintained until April 2019.
6970

71+
<a id="6.14.1"></a>
72+
## 2018-03-29, Version 6.14.1 'Boron' (LTS), @MylesBorins
73+
74+
### Notable Changes
75+
76+
No additional commits.
77+
78+
Due to incorrect staging of the upgrade to the GCC 4.9.X compiler, the latest releases for PPC little
79+
endian were built using GCC 4.9.X instead of GCC 4.8.X. This caused an ABI breakage on PPCLE based
80+
environments. This has been fixed in our infrastructure and we are doing this release to ensure that
81+
the hosted binaries are adhering to our platform support contract.
82+
7083
<a id="6.14.0"></a>
7184
## 2018-03-28, Version 6.14.0 'Boron' (LTS), @MylesBorins
7285

‎doc/changelogs/CHANGELOG_V8.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# Node.js 8 ChangeLog
23

34
<!--lint disable prohibited-strings-->
@@ -10,6 +11,7 @@
1011
</tr>
1112
<tr>
1213
<td valign="top">
14+
<a href="#8.11.1">8.11.1</a><br/>
1315
<a href="#8.11.0">8.11.0</a><br/>
1416
<a href="#8.10.0">8.10.0</a><br/>
1517
<a href="#8.9.4">8.9.4</a><br/>
@@ -53,6 +55,23 @@
5355
[Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
5456
will be supported actively until April 2019 and maintained until December 2019.
5557

58+
<a id="8.11.1"></a>
59+
## 2018-03-29, Version 8.11.1 'Carbon' (LTS), @MylesBorins
60+
61+
### Notable Changes
62+
63+
No additional commits.
64+
65+
Due to incorrect staging of the upgrade to the GCC 4.9.X compiler, the latest releases for PPC little
66+
endian were built using GCC 4.9.X instead of GCC 4.8.X. This caused an ABI breakage on PPCLE based
67+
environments. This has been fixed in our infrastructure and we are doing this release to ensure that
68+
the hosted binaries are adhering to our platform support contract.
69+
70+
Note that Node.js versions 10.X and later will be built with version 4.9.X or later of the GCC compiler,
71+
and it is possible that Node.js version 8.X may be built on the 4.9.X compiler at a later
72+
time as the stated [minimum compiler requirement](https://github.com/nodejs/node/blob/v8.x/BUILDING.md)
73+
for Node.js version 8.X is 4.9.4.
74+
5675
<a id="8.11.0"></a>
5776
## 2018-03-28, Version 8.11.0 'Carbon' (LTS), @MylesBorins
5877

‎doc/changelogs/CHANGELOG_V9.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</tr>
1010
<tr>
1111
<td>
12+
<a href="#9.10.1">9.10.1</a><br/>
1213
<a href="#9.10.0">9.10.0</a><br/>
1314
<a href="#9.9.0">9.9.0</a><br/>
1415
<a href="#9.8.0">9.8.0</a><br/>
@@ -38,6 +39,23 @@
3839
* [io.js](CHANGELOG_IOJS.md)
3940
* [Archive](CHANGELOG_ARCHIVE.md)
4041

42+
<a id="9.10.1"></a>
43+
## 2018-03-29, Version 9.10.1 (Current), @MylesBorins
44+
45+
### Notable Changes
46+
47+
No additional commits.
48+
49+
Due to incorrect staging of the upgrade to the GCC 4.9.X compiler, the latest releases for PPC little
50+
endian were built using GCC 4.9.X instead of GCC 4.8.X. This caused an ABI breakage on PPCLE based
51+
environments. This has been fixed in our infrastructure and we are doing this release to ensure that
52+
the hosted binaries are adhering to our platform support contract.
53+
54+
Note that Node.js versions 10.X and later will be built with version 4.9.X or later of the GCC compiler,
55+
and it is possible that Node.js version 9.X may be built on the 4.9.X compiler at a later
56+
time as the stated [minimum compiler requirement](https://github.com/nodejs/node/blob/v8.x/BUILDING.md)
57+
for Node.js version 9.X is 4.9.4.
58+
4159
<a id="9.10.0"></a>
4260
## 2018-03-28, Version 9.10.0 (Current), @MylesBorins prepared by @targos
4361

‎lib/_stream_readable.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,7 @@ function chunkInvalid(state, chunk) {
310310
// 'readable' event will be triggered.
311311
function needMoreData(state) {
312312
return !state.ended &&
313-
(state.needReadable ||
314-
state.length < state.highWaterMark ||
313+
(state.length < state.highWaterMark ||
315314
state.length === 0);
316315
}
317316

@@ -536,7 +535,17 @@ function emitReadable_(stream) {
536535
if (!state.destroyed && (state.length || state.ended)) {
537536
stream.emit('readable');
538537
}
539-
state.needReadable = !state.flowing && !state.ended;
538+
539+
// The stream needs another readable event if
540+
// 1. It is not flowing, as the flow mechanism will take
541+
// care of it.
542+
// 2. It is not ended.
543+
// 3. It is below the highWaterMark, so we can schedule
544+
// another readable later.
545+
state.needReadable =
546+
!state.flowing &&
547+
!state.ended &&
548+
state.length <= state.highWaterMark;
540549
flow(stream);
541550
}
542551

‎lib/internal/net.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function makeSyncWrite(fd) {
3232
if (enc !== 'buffer')
3333
chunk = Buffer.from(chunk, enc);
3434

35-
this._bytesDispatched += chunk.length;
35+
this._handle.bytesWritten += chunk.length;
3636

3737
const ctx = {};
3838
writeBuffer(fd, chunk, 0, chunk.length, null, undefined, ctx);

‎lib/net.js‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ function normalizeArgs(args) {
206206
// called when creating new Socket, or when re-using a closed Socket
207207
function initSocketHandle(self) {
208208
self._undestroy();
209-
self._bytesDispatched = 0;
210209
self._sockname = null;
211210

212211
// Handle creation may be deferred to bind() or connect() time.
@@ -222,7 +221,8 @@ function initSocketHandle(self) {
222221
}
223222

224223

225-
const BYTES_READ = Symbol('bytesRead');
224+
const kBytesRead = Symbol('kBytesRead');
225+
const kBytesWritten = Symbol('kBytesWritten');
226226

227227

228228
function Socket(options) {
@@ -278,6 +278,11 @@ function Socket(options) {
278278

279279
this._writev = null;
280280
this._write = makeSyncWrite(fd);
281+
// makeSyncWrite adjusts this value like the original handle would, so
282+
// we need to let it do that by turning it into a writable, own property.
283+
Object.defineProperty(this._handle, 'bytesWritten', {
284+
value: 0, writable: true
285+
});
281286
}
282287
} else {
283288
// these will be set once there is a connection
@@ -316,7 +321,8 @@ function Socket(options) {
316321
this._server = null;
317322

318323
// Used after `.destroy()`
319-
this[BYTES_READ] = 0;
324+
this[kBytesRead] = 0;
325+
this[kBytesWritten] = 0;
320326
}
321327
util.inherits(Socket, stream.Duplex);
322328

@@ -588,8 +594,9 @@ Socket.prototype._destroy = function(exception, cb) {
588594
if (this !== process.stderr)
589595
debug('close handle');
590596
var isException = exception ? true : false;
591-
// `bytesRead` should be accessible after `.destroy()`
592-
this[BYTES_READ] = this._handle.bytesRead;
597+
// `bytesRead` and `kBytesWritten` should be accessible after `.destroy()`
598+
this[kBytesRead] = this._handle.bytesRead;
599+
this[kBytesWritten] = this._handle.bytesWritten;
593600

594601
this._handle.close(() => {
595602
debug('emit close');
@@ -689,7 +696,7 @@ function protoGetter(name, callback) {
689696
}
690697

691698
protoGetter('bytesRead', function bytesRead() {
692-
return this._handle ? this._handle.bytesRead : this[BYTES_READ];
699+
return this._handle ? this._handle.bytesRead : this[kBytesRead];
693700
});
694701

695702
protoGetter('remoteAddress', function remoteAddress() {
@@ -761,8 +768,6 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
761768
// Bail out if handle.write* returned an error
762769
if (ret) return ret;
763770

764-
this._bytesDispatched += req.bytes;
765-
766771
if (!req.async) {
767772
cb();
768773
return;
@@ -782,6 +787,13 @@ Socket.prototype._write = function(data, encoding, cb) {
782787
this._writeGeneric(false, data, encoding, cb);
783788
};
784789

790+
791+
// Legacy alias. Having this is probably being overly cautious, but it doesn't
792+
// really hurt anyone either. This can probably be removed safely if desired.
793+
protoGetter('_bytesDispatched', function _bytesDispatched() {
794+
return this._handle ? this._handle.bytesWritten : this[kBytesWritten];
795+
});
796+
785797
protoGetter('bytesWritten', function bytesWritten() {
786798
var bytes = this._bytesDispatched;
787799
const state = this._writableState;

‎src/async_wrap.cc‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@ void AsyncWrap::EmitBefore(Environment* env, double async_id) {
202202
}
203203

204204

205-
void AsyncWrap::EmitTraceEventAfter() {
206-
switch (provider_type()) {
205+
void AsyncWrap::EmitTraceEventAfter(ProviderType type, double async_id) {
206+
switch (type) {
207207
#define V(PROVIDER) \
208208
case PROVIDER_ ## PROVIDER: \
209209
TRACE_EVENT_NESTABLE_ASYNC_END0( \
210210
TRACING_CATEGORY_NODE1(async_hooks), \
211-
#PROVIDER "_CALLBACK", static_cast<int64_t>(get_async_id())); \
211+
#PROVIDER "_CALLBACK", static_cast<int64_t>(async_id)); \
212212
break;
213213
NODE_ASYNC_PROVIDER_TYPES(V)
214214
#undef V
@@ -314,7 +314,7 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
314314
wrap->EmitTraceEventBefore();
315315
AsyncWrap::EmitBefore(wrap->env(), wrap->get_async_id());
316316
} else if (type == PromiseHookType::kAfter) {
317-
wrap->EmitTraceEventAfter();
317+
wrap->EmitTraceEventAfter(wrap->provider_type(), wrap->get_async_id());
318318
AsyncWrap::EmitAfter(wrap->env(), wrap->get_async_id());
319319
if (env->execution_async_id() == wrap->get_async_id()) {
320320
// This condition might not be true if async_hooks was enabled during
@@ -701,11 +701,14 @@ MaybeLocal<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
701701
Local<Value>* argv) {
702702
EmitTraceEventBefore();
703703

704+
ProviderType provider = provider_type();
704705
async_context context { get_async_id(), get_trigger_async_id() };
705706
MaybeLocal<Value> ret = InternalMakeCallback(
706707
env(), object(), cb, argc, argv, context);
707708

708-
EmitTraceEventAfter();
709+
// This is a static call with cached values because the `this` object may
710+
// no longer be alive at this point.
711+
EmitTraceEventAfter(provider, context.async_id);
709712

710713
return ret;
711714
}

0 commit comments

Comments
 (0)