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.

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

[v10.x backport] backport d48bd16 from v8 master #22909

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
1c3f81d
win,msi: install tools for native modules
joaocgreis Aug 29, 2018
05ace78
doc: `node debug` → `node inspect` in CLI docs
addaleax Sep 9, 2018
94e67b6
tools: fix doc tool behavior for version arrays
tniessen Sep 8, 2018
779e072
fs: implement mkdir recursive (mkdirp)
Aug 9, 2018
b1be08f
test: add comment describing test-fs-mkdir
Aug 21, 2018
75c288e
url: provide pathToFileURL and fileURLToPath
guybedford Aug 24, 2018
42e6ce2
test: check parameter type of fs.mkdir()
Aug 30, 2018
cf61a04
test: refactor structure of common/index
jasnell Aug 24, 2018
108a169
assert: align argument names
BridgeAR Sep 8, 2018
09ae073
doc: add history for withFileTypes in fs.readdir[Sync]()
tiendq Sep 10, 2018
8b6a161
crypto: fix public key encryption internals
tniessen Sep 9, 2018
b87ab0f
crypto: rename symbols to match guidelines
tniessen Sep 5, 2018
b9fd99e
doc: add gabrielschulhof to TSC
Trott Sep 12, 2018
8153c10
n-api: add generic finalizer callback
Aug 10, 2018
2b3b205
test: checks on napi factory wrap’s finalization
legendecas Aug 31, 2018
f41911f
lib: remove unnecessary symbols
Aug 22, 2018
01a5c7d
test: minor refactor in common/index.js
jasnell Sep 6, 2018
353cb4e
doc: document http2 timeouts
sagitsofan Sep 10, 2018
a214769
doc: add reference to guide for N-API additions
mhdawson Aug 29, 2018
e85c814
deps: cherry-pick 2363cdf from upstream V8
ofrobots Sep 11, 2018
92b695e
trace_events: avoid flusing uninitialized traces
ofrobots Sep 12, 2018
4159000
fs: ensure readdir() callback is only called once
cjihrig Sep 10, 2018
d853a3f
lib: simplify 'processChunkSync'
Sep 11, 2018
535c30c
module: add createRequireFunction method
devsnek Mar 14, 2018
ec6afb9
worker: correct (de)initialization order
addaleax Sep 9, 2018
c9f2283
tools: implement update-authors in JS
addaleax Sep 9, 2018
c898071
doc: update AUTHORS list
addaleax Sep 9, 2018
878d616
src: move getActiveResources/Handles to node_process.cc
jasnell Sep 7, 2018
27b0cb5
src: move DebugPortGetter/Setter to node_process.cc
jasnell Sep 7, 2018
4ba80b1
doc: fix typo in dns docs
MohammedEssehemy Sep 14, 2018
da86003
doc: add withFileTypes option to fsPromises.readdir
bengl Sep 13, 2018
1e07002
process: generate list of allowed env flags programmatically
addaleax Aug 31, 2018
a793163
lib: generate allowedNodeEnvironmentFlags lazily
addaleax Aug 31, 2018
81fd5d2
doc: add full deprecation history
tniessen Sep 8, 2018
479e1ec
fs: fix promisified fs.readdir withFileTypes
apapirovski Sep 13, 2018
f2ae0cb
src: fix `--prof-process` CLI argument handling
addaleax Sep 10, 2018
9441282
tracing: remove shutdown-on-signal
addaleax Sep 6, 2018
14c491c
path: remove unnecessary if statement
wchargin Aug 11, 2018
7c5e0d8
tools: update ESLint to 5.6.0
Trott Sep 16, 2018
3b763cd
src: move no_async_hooks_checks to env
danbev Sep 10, 2018
182ec37
[v10.x backport] backport d48bd16 from v8 master
Sep 17, 2018
9164ccf
update patch level
Sep 17, 2018
d0166ea
Revert "update patch level"
Sep 17, 2018
ce43fb1
update embedder string
Sep 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion .mailmap
Expand Up @@ -131,6 +131,7 @@ Gabriel de Perthuis <g2p.code@gmail.com>
Gareth Ellis <gareth.ellis@uk.ibm.com> <gareth@gsellis.com>
Garwah Lam <garwahlam@gmail.com>
Geoffrey Bugaisky <gbugaisk@gmail.com> gbugaisky <gbugaisk@gmail.com>
Gerhard Stoebich <deb2001-github@yahoo.de>
Gibson Fahnestock <gibfahn@gmail.com> <gib@uk.ibm.com>
Gil Pedersen <git@gpost.dk> <github@gpost.dk>
Graham Fairweather <xotic750@gmail.com> Xotic750 <xotic750@gmail>
Expand Down Expand Up @@ -204,6 +205,7 @@ Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
Juan Sebastian Velez Posada <sebasvelez@gmail.com>
Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
Karl Skomski <karl@skomski.com> <mail@skomski.com>
Kat Marchán <kzm@zkat.tech> <kzm@sykosomatic.org>
Kathy Truong <kathy.yvy.truong@gmail.com> k3kathy <kathy.yvy.truong@gmail.com>
Kazuyuki Yamada <tasogare.pg@gmail.com>
Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
Expand Down Expand Up @@ -238,6 +240,7 @@ Matheus Marchini <mat@mmarchini.me> <matheus@sthima.com.br>
Matheus Marchini <mat@mmarchini.me> <matheus@sthima.com>
Matt Lang <matt@mediasuite.co.nz> matt-in-a-hat <matt@mediasuite.co.nz>
Matt Reed <matthewreed26@gmail.com> matthewreed26 <matthewreed26@gmail.com>
Matteo Collina <matteo.collina@gmail.com> <hello@matteocollina.com>
Matthias Bastian <dev@matthias-bastian.de> piepmatz <piepmatz@users.noreply.github.com>
Mathias Buus <mathiasbuus@gmail.com> <m@ge.tt>
Mathias Pettersson <mape@mape.me>
Expand Down Expand Up @@ -364,6 +367,7 @@ Tadashi SAWADA <cesare@mayverse.jp>
Takahiro ANDO <takahiro.ando@gmail.com>
Tarun Batra <tarun.batra00@gmail.com> Tarun <tarun.batra00@gmail.com>
Ted Young <ted@radicaldesigns.org>
Teppei Sato <teppeis@gmail.com>
Thomas Hunter II <me@thomashunter.name> <tom@intrinsic.com>
Thomas Lee <thomas.lee@shinetech.com> <tom@tom-debian.sensis.com.au>
Thomas Reggi <thomas@reggi.com>
Expand Down Expand Up @@ -391,7 +395,8 @@ Vladimir de Turckheim <vlad2t@hotmail.com>
vsemozhetbyt <vsemozhetbyt@gmail.com> Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Wang Xinyong <wang.xy.chn@gmail.com> <wangxy.chn@gmail.com>
Weijia Wang <381152119@qq.com>
Weijia Wang <381152119@qq.com> starkewang <starkewang@tencent.com>
Weijia Wang <381152119@qq.com> <starkwang@126.com>
Weijia Wang <381152119@qq.com> <starkewang@tencent.com>
Wei-Wei Wu <wuxx1045@umn.edu>
Willi Eggeling <email@wje-online.de>
Will Hayslett <william.hayslettjr@gmail.com>
Expand Down
107 changes: 94 additions & 13 deletions AUTHORS
Expand Up @@ -650,7 +650,7 @@ Micleusanu Nicu <micnic90@gmail.com>
Alejandro Oviedo Garcia <alejandro.oviedo.g@gmail.com>
Ben Burns <benjamin.c.burns@gmail.com>
Julian Duque <julianduquej@gmail.com>
teppeis <teppeis@gmail.com>
Teppei Sato <teppeis@gmail.com>
Rudi Cilibrasi <cilibrar@morefuntechnologies.com>
Tim Ruffles <oi@truffles.me.uk>
CGavrila <cristi_gavrila1@yahoo.com>
Expand Down Expand Up @@ -754,14 +754,14 @@ Felipe Batista <fsbatista1@gmail.com>
Rebecca Turner <me@re-becca.org>
Tyler Anton <mtyleranton@gmail.com>
João Reis <reis@janeasystems.com>
Kat Marchán <kzm@sykosomatic.org>
Kat Marchán <kzm@zkat.tech>
Ryan Petschek <petschekr@gmail.com>
Pierre Inglebert <pierre.inglebert@gmail.com>
Ivan Yan <yan.2314@gmail.com>
Sangmin Yoon <sangmin.yoon@croquis.com>
Mark Plomer <mark.plomer@boerse-go.de>
Phillip Johnsen <johphi@gmail.com>
Matteo Collina <hello@matteocollina.com>
Matteo Collina <matteo.collina@gmail.com>
jomo <github@jomo.tv>
Gireesh Punathil <gpunathi@in.ibm.com>
Lucien Greathouse <me@lpghatguy.com>
Expand Down Expand Up @@ -1432,23 +1432,25 @@ Ahmad Nassri <ahmad@ahmadnassri.com>
Tom Atkinson <atkinson.tommy@nhome.ba>
Tobias Nießen <tniessen@tnie.de>
Joseph Gentle <me@josephg.com>
Arunesh Chandra <arunesh.chandra@microsoft.com>
Gabriel Schulhof <gabriel.schulhof@intel.com>
Ian Halliday <ianhall@microsoft.com>
Sampson Gao <sampsong@ca.ibm.com>
Taylor Woll <taylor.woll@microsoft.com>
Zero King <l2dy@icloud.com>
Raphael Okon <raphael@okon.io>
JR McEntee <jrmce12@gmail.com>
Lovell Fuller <github@lovell.info>
Jason Marsh <regularly.jason@gmail.com>
Vinay Hiremath <vhiremath4@gmail.com>
Gabriel Schulhof <gabriel.schulhof@intel.com>
alejandro <alemures@hotmail.com>
dave-k <davek1802@gmail.com>
Steven <steven@ceriously.com>
Uppinder Chugh <uppinderchugh@gmail.com>
Karl Cheng <qantas94heavy@gmail.com>
Taylor Woll <taylor.woll@microsoft.com>
Tarun Batra <tarun.batra00@gmail.com>
Nao YONASHIRO <owan.orisano@gmail.com>
Christopher Luke <zaide@zaidesthings.com>
Sampson Gao <sampsong@ca.ibm.com>
John Paul Bamberg <jpbamberg1993@gmail.com>
Cody Deckard <cjdeckard@gmail.com>
Fabio Campinho <fcampinho@gmail.com>
Expand Down Expand Up @@ -1488,7 +1490,7 @@ Madara Uchiha <me@madara.ninja>
Gil Tayar <gil@tayar.org>
Glenn Schlereth <Glenn.Schlereth@gmail.com>
Artur G Vieira <vieira.artur.g@gmail.com>
Flarna <deb2001-github@yahoo.de>
Gerhard Stoebich <deb2001-github@yahoo.de>
Sreepurna Jasti <sreepurna.jasti@gmail.com>
Rafael Fragoso <rafaelfragosom@gmail.com>
Andrei Cioromila <andrei.cioromila@gmail.com>
Expand Down Expand Up @@ -1658,6 +1660,8 @@ Piotr Mionskowski <piotr.mionskowski@gmail.com>
Cyril Lakech <cyril.lakech@axa.fr>
Eduard Bondarenko <eduardbcom@gmail.com>
Adina Shanholtz <ashanhol@gmail.com>
Guy Bedford <guybedford@gmail.com>
Jan Krems <jan.krems@groupon.com>
Miguel Martins <mmartins@uphold.com>
Yury Popov <github@phoenix.dj>
George Bezerra <georgelione@gmail.com>
Expand All @@ -1670,7 +1674,6 @@ Alex Gresnel <31708810+agresnel@users.noreply.github.com>
Will Young <lost.networking@gmail.com>
Martijn Schrage <martijn@oblomov.com>
Halil İbrahim Şener <hisener@yahoo.com>
Guy Bedford <guybedford@gmail.com>
Antoine Amara <amara.antoine@gmail.com>
Mani Maghsoudlou <manidlou@gmail.com>
Bartek Szczepański <hello@barnski.pl>
Expand Down Expand Up @@ -1884,7 +1887,6 @@ Ashish Kaila <ashishkaila@hotmail.com>
c0b <14798161+c0b@users.noreply.github.com>
Damian <damianczapiewski@gmail.com>
Alec Perkins <alecperkins@gmail.com>
Teppei Sato <teppeis@gmail.com>
Jinwoo Lee <jinwoo68@gmail.com>
Peter Marton <email@martonpeter.com>
Erwin W. Ramadhan <erwinwahyuramadhan@gmail.com>
Expand Down Expand Up @@ -2154,9 +2156,7 @@ Nick Filatov <keddofilatov@gmail.com>
Jesse Gorzinski <jgorzinski@gmail.com>
Pieter Mees <pieter.mees@zentrick.com>
Malcolm White <malcolmwhite@google.com>
Gerhard Stoebich <deb2001-github@yahoo.de>
Matei Copot <matei@copot.eu>
ikasumiwt <wtsnyk13@gmail.com>
Gurin, Sebastian <sgurin@netsuite.com>
Indranil Dasgupta <indranild@gmail.com>
Harry Sarson <harry.sarson@hotmail.co.uk>
Expand Down Expand Up @@ -2187,7 +2187,6 @@ Kyle Martin <kyle.martin@hotmail.co.nz>
Denis Fäcke <serayaeryn@gmail.com>
Daylor Yanes <daylor.yanes@gmail.com>
Carrie Coxwell <carrie.coxwell@gmail.com>
BeniCheni <benjaminlchen@gmail.com>
Masashi Hirano <cherrydog07@gmail.com>
Brandon Ruggles <brandonrninefive@gmail.com>
Allen Yonghuang Wang <helloshuangzi@gmail.com>
Expand Down Expand Up @@ -2218,6 +2217,7 @@ Abhimanyu Vashisht <abhimanyuvashisht.av@gmail.com>
Sagir Khan <sagir.khan@gmail.com>
Kael Zhang <i+github@kael.me>
Unknown <bdistin@gmail.com>
Krzysztof Taborski <taborskikrzysztof@gmail.com>
Blaine Bublitz <blaine.bublitz@gmail.com>
Shailesh Shekhawat <sshekhawat356@gmail.com>
Davis Okoth <davisokoth@gmail.com>
Expand All @@ -2236,5 +2236,86 @@ Shelley Vohr <shelley.vohr@gmail.com>
Deepjyoti Mondal <djmdeveloper060796@gmail.com>
Brett Kiefer <brett@trello.com>
Kevin Thomas <kevintab95@gmail.com>
ZaneHannanAU <ZaneHannanAU@users.noreply.github.com>
Fernando Doglio <deleteman@gmail.com>
Renée Kooi <renee@kooi.me>
Jo Colina <jo@bottomatik.com>
itaysabato <itaysabato@gmail.com>
Victor Belozyorov <hi@vbelozyorov.com>
Joonas Rouhiainen <joonas.rouhiainen@reaktor.com>
GauthamBanasandra <gautham.bangalore@gmail.com>
Hugo Josefson <hugo@josefson.org>
Sam Ruby <rubys@intertwingly.net>
Haroon Khan <aitchkhan@gmail.com>
Developer Davo <DeveloperDavo@users.noreply.github.com>
Jacek Pospychała <jacek.pospychala@currency-one.com>
MaleDong <maledong_private@qq.com>
iwko <iwoczerniawski@gmail.com>
Sohail Rajdev <sohailrajdev97@gmail.com>
Niicck <niicck@users.noreply.github.com>
Denys Otrishko <shishugi@gmail.com>
Sergey Zelenov <mail@zelenov.su>
Travis Fischer <fisch0920@gmail.com>
Dominic Farolino <domfarolino@gmail.com>
Octavian Soldea <octavian.soldea@intel.com>
XhmikosR <xhmikosr@gmail.com>
AdityaSrivast <yashsri421@gmail.com>
Javier Gonzalez <xaviergonz@gmail.com>
RidgeA <antongriadchenko@gmail.com>
Ryuichi Sakagami <shagamiiiii@gmail.com>
hectorcoronado <hectorcoronado.developer@gmail.com>
Petras <15868923+kimberlake@users.noreply.github.com>
Kevin Lacabane <5239883+klacabane@users.noreply.github.com>
Simionescu, Radu <radsimu@gmail.com>
mariotsi <simone@mariotti.me>
prayag21 <10997858+prayag21@users.noreply.github.com>
Bruno Pinho <bpinhosilva@gmail.com>
Anto Aravinth <anto.aravinth.cse@gmail.com>
Helio Frota <00hf11@gmail.com>
Tim Ruffles <timruffles@googlemail.com>
Jacob Page <jpage@godaddy.com>
sagulati <sagulati@adobe.com>
conectado <gabrielalejandro7@gmail.com>
Vitor Bruno de Oliveira Barth <vbob@vbob.com.br>
cclauss <cclauss@bluewin.ch>
James Ide <ide@expo.io>
MaleDong <maledong_github@outlook.com>
bhavayAnand9 <bhavayanandcse@gmail.com>
Brandon Lee <40652534+brandonlwt@users.noreply.github.com>
Oryan Moshe <iamoryanmoshe@gmail.com>
Michael Sommer <sommerdrummer@gmail.com>
Eugene Y. Q. Shen <eugene@eyqs.ca>
Rishabh Singh <rishabhptr@gmail.com>
Marco Levrero <marco.levrero@gmail.com>
Ouyang Yadong <oyydoibh@gmail.com>
yahavfuchs <yahavf6@gmail.com>
Thomas Leah <thomas@leahfamily.plus.com>
Musa Hamwala <musahamwala@icloud.com>
James Bromwell <james.bromwell@gdit.com>
Jeremy Apthorp <nornagon@nornagon.net>
Eugen Cazacu <32613393+oygen87@users.noreply.github.com>
James Bromwell <943160+thw0rted@users.noreply.github.com>
Csaba Palfi <csaba@palfi.me>
Ryan Petrich <rpetrich@gmail.com>
Andreas Girgensohn <andreasg@fxpal.com>
Caleb Sander <caleb.sander@gmail.com>
Dzmitry_Prudnikau <dzmitriyprudnikov@gmail.com>
Ian McKellar <ianloic@google.com>
Jennifer Bland <jennifer.bland@sbdinc.com>
Kyle Fuller <kyle@fuller.li>
ZYSzys <zyszys98@gmail.com>
Neeraj Laad <neeraj.laad@uk.ibm.com>
Scott Van Gilder <svangilder@gmail.com>
Yaniv Friedensohn <yaniv.friedensohn@gmail.com>
Lars-Magnus Skog <ralphtheninja@riseup.net>
Lucas Woo <legendecas@gmail.com>
Troels Liebe Bentsen <troels@connectedcars.dk>
pranshuchittora <pranshuchittora17@gmail.com>
lakamsani <lakamsani@gmail.com>
Chris White <cxwembedded@gmail.com>
Ben Newman <ben@meteor.com>
Szymon Marczak <sz.marczak@gmail.com>
Tessei Kameyama <kamenoko315@ruri.waseda.jp>
Chakravarthy S M <chakra.mithun@gmail.com>

# Generated by tools/update-authors.sh
# Generated by tools/update-authors.js
13 changes: 13 additions & 0 deletions COLLABORATOR_GUIDE.md
Expand Up @@ -21,6 +21,7 @@
- [When Breaking Changes Actually Break Things](#when-breaking-changes-actually-break-things)
- [Reverting commits](#reverting-commits)
- [Introducing New Modules](#introducing-new-modules)
- [Additions to N-API](#additions-to-n-api)
- [Deprecations](#deprecations)
- [Involving the TSC](#involving-the-tsc)
* [Landing Pull Requests](#landing-pull-requests)
Expand Down Expand Up @@ -411,6 +412,18 @@ For new modules that involve significant effort, non-trivial additions to
Node.js or significant new capabilities, an [Enhancement Proposal][] is
recommended but not required.

### Additions to N-API

N-API provides an ABI stable API that we will have to support in future
versions without the usual option to modify or remove existing APIs on
SemVer boundaries. Therefore, additions need to be managed carefully.

This
[guide](https://github.com/nodejs/node/blob/master/doc/guides/adding-new-napi-api.md)
outlines the requirements and principles that we should follow when
approving and landing new N-API APIs (any additions to `node_api.h` and
`node_api_types.h`).

### Deprecations

[_Deprecation_][] is "the discouragement of use of some … feature … or practice,
Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -249,6 +249,8 @@ For more information about the governance of the Node.js project, see
**Franziska Hinkelmann** &lt;franziska.hinkelmann@gmail.com&gt; (she/her)
* [Fishrock123](https://github.com/Fishrock123) -
**Jeremiah Senkpiel** &lt;fishrock123@rocketmail.com&gt;
* [gabrielschulhof](https://github.com/gabrielschulhof) -
**Gabriel Schulhof** &lt;gabriel.schulhof@intel.com&gt;
* [gibfahn](https://github.com/gibfahn) -
**Gibson Fahnestock** &lt;gibfahn@gmail.com&gt; (he/him)
* [jasnell](https://github.com/jasnell) -
Expand Down
23 changes: 23 additions & 0 deletions benchmark/fs/bench-mkdirp.js
@@ -0,0 +1,23 @@
'use strict';

const common = require('../common');
const fs = require('fs');
const tmpdir = require('../../test/common/tmpdir');
tmpdir.refresh();
let dirc = 0;

const bench = common.createBenchmark(main, {
n: [1e4],
});

function main({ n }) {
bench.start();
(function r(cntr) {
if (cntr-- <= 0)
return bench.end(n);
const pathname = `${tmpdir.path}/${++dirc}/${++dirc}/${++dirc}/${++dirc}`;
fs.mkdir(pathname, { createParents: true }, (err) => {
r(cntr);
});
}(n));
}
2 changes: 1 addition & 1 deletion common.gypi
Expand Up @@ -29,7 +29,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.25',
'v8_embedder_string': '-node.27',

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
6 changes: 3 additions & 3 deletions deps/v8/src/base/platform/platform-posix.cc
Expand Up @@ -246,11 +246,11 @@ void* OS::GetRandomMmapAddr() {
// Use extra address space to isolate the mmap regions.
raw_addr += uint64_t{0x400000000000};
#elif V8_TARGET_BIG_ENDIAN
// Big-endian Linux: 44 bits of virtual addressing.
// Big-endian Linux: 42 bits of virtual addressing.
raw_addr &= uint64_t{0x03FFFFFFF000};
#else
// Little-endian Linux: 48 bits of virtual addressing.
raw_addr &= uint64_t{0x3FFFFFFFF000};
// Little-endian Linux: 46 bits of virtual addressing.
raw_addr &= uint64_t{0x3FFFFFFF0000};
#endif
#elif V8_TARGET_ARCH_MIPS64
// We allocate code in 256 MB aligned segments because of optimizations using
Expand Down
32 changes: 18 additions & 14 deletions deps/v8/src/libplatform/tracing/tracing-controller.cc
Expand Up @@ -63,13 +63,15 @@ uint64_t TracingController::AddTraceEvent(
const uint64_t* arg_values,
std::unique_ptr<v8::ConvertableToTraceFormat>* arg_convertables,
unsigned int flags) {
uint64_t handle;
TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle);
if (trace_object) {
trace_object->Initialize(
phase, category_enabled_flag, name, scope, id, bind_id, num_args,
arg_names, arg_types, arg_values, arg_convertables, flags,
CurrentTimestampMicroseconds(), CurrentCpuTimestampMicroseconds());
uint64_t handle = 0;
if (mode_ != DISABLED) {
TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle);
if (trace_object) {
trace_object->Initialize(
phase, category_enabled_flag, name, scope, id, bind_id, num_args,
arg_names, arg_types, arg_values, arg_convertables, flags,
CurrentTimestampMicroseconds(), CurrentCpuTimestampMicroseconds());
}
}
return handle;
}
Expand All @@ -81,13 +83,15 @@ uint64_t TracingController::AddTraceEventWithTimestamp(
const uint64_t* arg_values,
std::unique_ptr<v8::ConvertableToTraceFormat>* arg_convertables,
unsigned int flags, int64_t timestamp) {
uint64_t handle;
TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle);
if (trace_object) {
trace_object->Initialize(phase, category_enabled_flag, name, scope, id,
bind_id, num_args, arg_names, arg_types,
arg_values, arg_convertables, flags, timestamp,
CurrentCpuTimestampMicroseconds());
uint64_t handle = 0;
if (mode_ != DISABLED) {
TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle);
if (trace_object) {
trace_object->Initialize(phase, category_enabled_flag, name, scope, id,
bind_id, num_args, arg_names, arg_types,
arg_values, arg_convertables, flags, timestamp,
CurrentCpuTimestampMicroseconds());
}
}
return handle;
}
Expand Down
4 changes: 2 additions & 2 deletions doc/api/cli.md
Expand Up @@ -12,13 +12,13 @@ To view this documentation as a manual page in a terminal, run `man node`.

`node [options] [V8 options] [script.js | -e "script" | -] [--] [arguments]`

`node debug [script.js | -e "script" | <host>:<port>] …`
`node inspect [script.js | -e "script" | <host>:<port>] …`

`node --v8-options`

Execute without arguments to start the [REPL][].

_For more info about `node debug`, please see the [debugger][] documentation._
_For more info about `node inspect`, please see the [debugger][] documentation._

## Options

Expand Down