Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 730fa9e

Browse files
bnoordhuisFyko
bnoordhuis
authored and
Fyko
committedSep 15, 2022
build: remove dtrace & etw support
There are no clear indicators anyone is using the dtrace USDT probes. ETW support is very intertwined with the dtrace infrastructure. It's not clear if anyone uses ETW so to keep things simple it too is removed. Fixes: nodejs#43649 PR-URL: nodejs#43652 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gerhard Stöbich <[email protected]>
1 parent d998684 commit 730fa9e

31 files changed

+10
-2722
lines changed
 

‎common.gypi

-3
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,6 @@
546546
}],
547547
],
548548
}],
549-
['OS=="freebsd" and node_use_dtrace=="true"', {
550-
'libraries': [ '-lelf' ],
551-
}],
552549
['OS=="freebsd"', {
553550
'ldflags': [
554551
'-Wl,--export-dynamic',

‎configure.py

-44
Original file line numberDiff line numberDiff line change
@@ -508,18 +508,6 @@
508508
help='MIPS floating-point ABI ({0}) [default: %(default)s]'.format(
509509
', '.join(valid_mips_float_abi)))
510510

511-
parser.add_argument('--with-dtrace',
512-
action='store_true',
513-
dest='with_dtrace',
514-
default=None,
515-
help='build with DTrace (default is true on sunos and darwin)')
516-
517-
parser.add_argument('--with-etw',
518-
action='store_true',
519-
dest='with_etw',
520-
default=None,
521-
help='build with ETW (default is true on Windows)')
522-
523511
parser.add_argument('--use-largepages',
524512
action='store_true',
525513
dest='node_use_large_pages',
@@ -628,18 +616,6 @@
628616

629617
parser.add_argument_group(http2_optgroup)
630618

631-
parser.add_argument('--without-dtrace',
632-
action='store_true',
633-
dest='without_dtrace',
634-
default=None,
635-
help='build without DTrace')
636-
637-
parser.add_argument('--without-etw',
638-
action='store_true',
639-
dest='without_etw',
640-
default=None,
641-
help='build without ETW')
642-
643619
parser.add_argument('--without-npm',
644620
action='store_true',
645621
dest='without_npm',
@@ -1306,18 +1282,6 @@ def configure_node(o):
13061282

13071283
o['variables']['enable_lto'] = b(options.enable_lto)
13081284

1309-
if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
1310-
use_dtrace = not options.without_dtrace
1311-
# Don't enable by default on linux and freebsd
1312-
if flavor in ('linux', 'freebsd'):
1313-
use_dtrace = options.with_dtrace
1314-
o['variables']['node_use_dtrace'] = b(use_dtrace)
1315-
elif options.with_dtrace:
1316-
raise Exception(
1317-
'DTrace is currently only supported on SunOS, MacOS or Linux systems.')
1318-
else:
1319-
o['variables']['node_use_dtrace'] = 'false'
1320-
13211285
if options.node_use_large_pages or options.node_use_large_pages_script_lld:
13221286
warn('''The `--use-largepages` and `--use-largepages-script-lld` options
13231287
have no effect during build time. Support for mapping to large pages is
@@ -1328,14 +1292,6 @@ def configure_node(o):
13281292
if options.no_ifaddrs:
13291293
o['defines'] += ['SUNOS_NO_IFADDRS']
13301294

1331-
# By default, enable ETW on Windows.
1332-
if flavor == 'win':
1333-
o['variables']['node_use_etw'] = b(not options.without_etw)
1334-
elif options.with_etw:
1335-
raise Exception('ETW is only supported on Windows.')
1336-
else:
1337-
o['variables']['node_use_etw'] = 'false'
1338-
13391295
o['variables']['node_with_ltcg'] = b(options.with_ltcg)
13401296
if flavor != 'win' and options.with_ltcg:
13411297
raise Exception('Link Time Code Generation is only supported on Windows.')

‎doc/api/process.md

-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,6 @@ An example of the possible output looks like:
10751075
node_shared_http_parser: 'false',
10761076
node_shared_libuv: 'false',
10771077
node_shared_zlib: 'false',
1078-
node_use_dtrace: 'false',
10791078
node_use_openssl: 'true',
10801079
node_shared_openssl: 'false',
10811080
strict_aliasing: 'true',

‎lib/_http_client.js

-7
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ const {
7777
validateInteger,
7878
} = require('internal/validators');
7979
const { getTimerDuration } = require('internal/timers');
80-
const {
81-
DTRACE_HTTP_CLIENT_REQUEST,
82-
DTRACE_HTTP_CLIENT_RESPONSE
83-
} = require('internal/dtrace');
84-
8580
const {
8681
hasObserver,
8782
startPerf,
@@ -356,7 +351,6 @@ ObjectSetPrototypeOf(ClientRequest.prototype, OutgoingMessage.prototype);
356351
ObjectSetPrototypeOf(ClientRequest, OutgoingMessage);
357352

358353
ClientRequest.prototype._finish = function _finish() {
359-
DTRACE_HTTP_CLIENT_REQUEST(this, this.socket);
360354
FunctionPrototypeCall(OutgoingMessage.prototype._finish, this);
361355
if (hasObserver('http')) {
362356
startPerf(this, kClientRequestStatistics, {
@@ -642,7 +636,6 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
642636
req.shouldKeepAlive = false;
643637
}
644638

645-
DTRACE_HTTP_CLIENT_RESPONSE(socket, req);
646639
if (req[kClientRequestStatistics] && hasObserver('http')) {
647640
stopPerf(req, kClientRequestStatistics, {
648641
detail: {

‎lib/_http_server.js

-6
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ const {
7979
validateBoolean
8080
} = require('internal/validators');
8181
const Buffer = require('buffer').Buffer;
82-
const {
83-
DTRACE_HTTP_SERVER_REQUEST,
84-
DTRACE_HTTP_SERVER_RESPONSE
85-
} = require('internal/dtrace');
8682
const { setInterval, clearInterval } = require('timers');
8783
let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
8884
debug = fn;
@@ -215,7 +211,6 @@ ObjectSetPrototypeOf(ServerResponse.prototype, OutgoingMessage.prototype);
215211
ObjectSetPrototypeOf(ServerResponse, OutgoingMessage);
216212

217213
ServerResponse.prototype._finish = function _finish() {
218-
DTRACE_HTTP_SERVER_RESPONSE(this.socket);
219214
if (this[kServerResponseStatistics] && hasObserver('http')) {
220215
stopPerf(this, kServerResponseStatistics, {
221216
detail: {
@@ -944,7 +939,6 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
944939

945940
res.shouldKeepAlive = keepAlive;
946941
res[kUniqueHeaders] = server[kUniqueHeaders];
947-
DTRACE_HTTP_SERVER_REQUEST(req, socket);
948942

949943
if (onRequestStartChannel.hasSubscribers) {
950944
onRequestStartChannel.publish({

‎lib/internal/dtrace.js

-21
This file was deleted.

‎lib/net.js

-6
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ const {
111111
validateString
112112
} = require('internal/validators');
113113
const kLastWriteQueueSize = Symbol('lastWriteQueueSize');
114-
const {
115-
DTRACE_NET_SERVER_CONNECTION,
116-
DTRACE_NET_STREAM_END
117-
} = require('internal/dtrace');
118114

119115
// Lazy loaded to improve startup performance.
120116
let cluster;
@@ -654,7 +650,6 @@ Socket.prototype._read = function(n) {
654650
Socket.prototype.end = function(data, encoding, callback) {
655651
stream.Duplex.prototype.end.call(this,
656652
data, encoding, callback);
657-
DTRACE_NET_STREAM_END(this);
658653
return this;
659654
};
660655

@@ -1711,7 +1706,6 @@ function onconnection(err, clientHandle) {
17111706
socket.server = self;
17121707
socket._server = self;
17131708

1714-
DTRACE_NET_SERVER_CONNECTION(socket);
17151709
self.emit('connection', socket);
17161710
}
17171711

‎node.gyp

-245
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
'v8_trace_maps%': 0,
55
'v8_enable_pointer_compression%': 0,
66
'v8_enable_31bit_smis_on_64bit_arch%': 0,
7-
'node_use_dtrace%': 'false',
8-
'node_use_etw%': 'false',
97
'node_no_browser_globals%': 'false',
108
'node_snapshot_main%': '',
119
'node_use_node_snapshot%': 'false',
@@ -236,16 +234,6 @@
236234
'-Wl,--no-whole-archive',
237235
],
238236
}],
239-
[ 'OS=="win"', {
240-
'sources': [ 'src/res/node.rc' ],
241-
'conditions': [
242-
[ 'node_use_etw=="true"', {
243-
'sources': [
244-
'tools/msvs/genfiles/node_etw_provider.rc'
245-
],
246-
}],
247-
],
248-
}],
249237
],
250238
}],
251239
[ 'node_shared=="true"', {
@@ -755,72 +743,6 @@
755743
'Ws2_32',
756744
],
757745
}],
758-
[ 'node_use_etw=="true"', {
759-
'defines': [ 'HAVE_ETW=1' ],
760-
'dependencies': [ 'node_etw' ],
761-
'include_dirs': [
762-
'src',
763-
'tools/msvs/genfiles',
764-
'<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
765-
],
766-
'sources': [
767-
'src/node_win32_etw_provider.h',
768-
'src/node_win32_etw_provider-inl.h',
769-
'src/node_win32_etw_provider.cc',
770-
'src/node_dtrace.h',
771-
'src/node_dtrace.cc',
772-
'tools/msvs/genfiles/node_etw_provider.h',
773-
],
774-
'conditions': [
775-
['node_intermediate_lib_type != "static_library"', {
776-
'sources': [
777-
'tools/msvs/genfiles/node_etw_provider.rc',
778-
],
779-
}],
780-
],
781-
}],
782-
[ 'node_use_dtrace=="true"', {
783-
'defines': [ 'HAVE_DTRACE=1' ],
784-
'dependencies': [
785-
'node_dtrace_header',
786-
'specialize_node_d',
787-
],
788-
'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
789-
#
790-
# DTrace is supported on linux, solaris, mac, and bsd. There are
791-
# three object files associated with DTrace support, but they're
792-
# not all used all the time:
793-
#
794-
# node_dtrace.o all configurations
795-
# node_dtrace_ustack.o not supported on mac and linux
796-
# node_dtrace_provider.o All except OS X. "dtrace -G" is not
797-
# used on OS X.
798-
#
799-
# Note that node_dtrace_provider.cc and node_dtrace_ustack.cc do not
800-
# actually exist. They're listed here to trick GYP into linking the
801-
# corresponding object files into the final "node" executable. These
802-
# object files are generated by "dtrace -G" using custom actions
803-
# below, and the GYP-generated Makefiles will properly build them when
804-
# needed.
805-
#
806-
'sources': [
807-
'src/node_dtrace.h',
808-
'src/node_dtrace.cc',
809-
],
810-
'conditions': [
811-
[ 'OS=="linux"', {
812-
'sources': [
813-
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
814-
],
815-
}],
816-
[ 'OS!="mac" and OS!="linux"', {
817-
'sources': [
818-
'src/node_dtrace_ustack.cc',
819-
'src/node_dtrace_provider.cc',
820-
]
821-
}
822-
] ]
823-
} ],
824746
[ 'node_use_openssl=="true"', {
825747
'sources': [
826748
'src/crypto/crypto_aes.cc',
@@ -955,164 +877,6 @@
955877
},
956878
],
957879
}, # node_lib_target_name
958-
{
959-
# generate ETW header and resource files
960-
'target_name': 'node_etw',
961-
'type': 'none',
962-
'conditions': [
963-
[ 'node_use_etw=="true"', {
964-
'actions': [
965-
{
966-
'action_name': 'node_etw',
967-
'inputs': [ 'src/res/node_etw_provider.man' ],
968-
'outputs': [
969-
'tools/msvs/genfiles/node_etw_provider.rc',
970-
'tools/msvs/genfiles/node_etw_provider.h',
971-
'tools/msvs/genfiles/node_etw_providerTEMP.BIN',
972-
],
973-
'action': [ 'mc <@(_inputs) -h tools/msvs/genfiles -r tools/msvs/genfiles' ]
974-
}
975-
]
976-
} ]
977-
]
978-
}, # node_etw
979-
{
980-
'target_name': 'node_dtrace_header',
981-
'type': 'none',
982-
'conditions': [
983-
[ 'node_use_dtrace=="true" and OS!="linux"', {
984-
'actions': [
985-
{
986-
'action_name': 'node_dtrace_header',
987-
'inputs': [ 'src/node_provider.d' ],
988-
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
989-
'action': [ 'dtrace', '-h', '-xnolibs', '-s', '<@(_inputs)',
990-
'-o', '<@(_outputs)' ]
991-
}
992-
]
993-
} ],
994-
[ 'node_use_dtrace=="true" and OS=="linux"', {
995-
'actions': [
996-
{
997-
'action_name': 'node_dtrace_header',
998-
'inputs': [ 'src/node_provider.d' ],
999-
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
1000-
'action': [ 'dtrace', '-h', '-s', '<@(_inputs)',
1001-
'-o', '<@(_outputs)' ]
1002-
}
1003-
]
1004-
} ],
1005-
]
1006-
}, # node_dtrace_header
1007-
{
1008-
'target_name': 'node_dtrace_provider',
1009-
'type': 'none',
1010-
'conditions': [
1011-
[ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
1012-
'actions': [
1013-
{
1014-
'action_name': 'node_dtrace_provider_o',
1015-
'inputs': [
1016-
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace.o',
1017-
],
1018-
'outputs': [
1019-
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_provider.o'
1020-
],
1021-
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
1022-
'<@(_inputs)', '-o', '<@(_outputs)' ]
1023-
}
1024-
]
1025-
}],
1026-
[ 'node_use_dtrace=="true" and OS=="linux"', {
1027-
'actions': [
1028-
{
1029-
'action_name': 'node_dtrace_provider_o',
1030-
'inputs': [ 'src/node_provider.d' ],
1031-
'outputs': [
1032-
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
1033-
],
1034-
'action': [
1035-
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
1036-
],
1037-
}
1038-
],
1039-
}],
1040-
]
1041-
}, # node_dtrace_provider
1042-
{
1043-
'target_name': 'node_dtrace_ustack',
1044-
'type': 'none',
1045-
'conditions': [
1046-
[ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
1047-
'actions': [
1048-
{
1049-
'action_name': 'node_dtrace_ustack_constants',
1050-
'inputs': [
1051-
'<(obj_dir)/tools/v8_gypfiles/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)'
1052-
],
1053-
'outputs': [
1054-
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
1055-
],
1056-
'action': [
1057-
'tools/genv8constants.py',
1058-
'<@(_outputs)',
1059-
'<@(_inputs)'
1060-
]
1061-
},
1062-
{
1063-
'action_name': 'node_dtrace_ustack',
1064-
'inputs': [
1065-
'src/v8ustack.d',
1066-
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
1067-
],
1068-
'outputs': [
1069-
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
1070-
],
1071-
'conditions': [
1072-
[ 'target_arch=="ia32" or target_arch=="arm"', {
1073-
'action': [
1074-
'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
1075-
'-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
1076-
]
1077-
} ],
1078-
[ 'target_arch=="x64"', {
1079-
'action': [
1080-
'dtrace', '-64', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
1081-
'-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
1082-
]
1083-
} ],
1084-
]
1085-
},
1086-
]
1087-
} ],
1088-
]
1089-
}, # node_dtrace_ustack
1090-
{
1091-
'target_name': 'specialize_node_d',
1092-
'type': 'none',
1093-
'conditions': [
1094-
[ 'node_use_dtrace=="true"', {
1095-
'actions': [
1096-
{
1097-
'action_name': 'specialize_node_d',
1098-
'inputs': [
1099-
'src/node.d'
1100-
],
1101-
'outputs': [
1102-
'<(PRODUCT_DIR)/node.d',
1103-
],
1104-
'action': [
1105-
'tools/specialize_node_d.py',
1106-
'<@(_outputs)',
1107-
'<@(_inputs)',
1108-
'<@(OS)',
1109-
'<@(target_arch)',
1110-
],
1111-
},
1112-
],
1113-
} ],
1114-
]
1115-
}, # specialize_node_d
1116880
{ # fuzz_url
1117881
'target_name': 'fuzz_url',
1118882
'type': 'executable',
@@ -1151,9 +915,6 @@
1151915
'<(node_lib_target_name)',
1152916
'deps/histogram/histogram.gyp:histogram',
1153917
'deps/uvwasi/uvwasi.gyp:uvwasi',
1154-
'node_dtrace_header',
1155-
'node_dtrace_ustack',
1156-
'node_dtrace_provider',
1157918
],
1158919
'includes': [
1159920
'node.gypi'
@@ -1197,9 +958,6 @@
1197958
'deps/googletest/googletest.gyp:gtest_main',
1198959
'deps/histogram/histogram.gyp:histogram',
1199960
'deps/uvwasi/uvwasi.gyp:uvwasi',
1200-
'node_dtrace_header',
1201-
'node_dtrace_ustack',
1202-
'node_dtrace_provider',
1203961
],
1204962

1205963
'includes': [
@@ -1295,9 +1053,6 @@
12951053
'<(node_lib_target_name)',
12961054
'deps/histogram/histogram.gyp:histogram',
12971055
'deps/uvwasi/uvwasi.gyp:uvwasi',
1298-
'node_dtrace_header',
1299-
'node_dtrace_ustack',
1300-
'node_dtrace_provider',
13011056
],
13021057

13031058
'includes': [

‎src/node.cc

-8
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
#include "inspector_io.h"
5656
#endif
5757

58-
#if defined HAVE_DTRACE || defined HAVE_ETW
59-
#include "node_dtrace.h"
60-
#endif
61-
6258
#if NODE_USE_V8_PLATFORM
6359
#include "libplatform/libplatform.h"
6460
#endif // NODE_USE_V8_PLATFORM
@@ -292,10 +288,6 @@ void Environment::InitializeDiagnostics() {
292288
env->isolate()->SetAtomicsWaitCallback(nullptr, nullptr);
293289
}, this);
294290
}
295-
296-
#if defined HAVE_DTRACE || defined HAVE_ETW
297-
InitDTrace(this);
298-
#endif
299291
}
300292

301293
MaybeLocal<Value> Environment::BootstrapInternalLoaders() {

‎src/node.d

-315
This file was deleted.

‎src/node_binding.cc

+1-8
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
#define NODE_BUILTIN_PROFILER_MODULES(V)
2727
#endif
2828

29-
#if HAVE_DTRACE || HAVE_ETW
30-
#define NODE_BUILTIN_DTRACE_MODULES(V) V(dtrace)
31-
#else
32-
#define NODE_BUILTIN_DTRACE_MODULES(V)
33-
#endif
34-
3529
// A list of built-in modules. In order to do module registration
3630
// in node::Init(), need to add built-in modules in the following list.
3731
// Then in binding::RegisterBuiltinModules(), it calls modules' registration
@@ -96,8 +90,7 @@
9690
NODE_BUILTIN_STANDARD_MODULES(V) \
9791
NODE_BUILTIN_OPENSSL_MODULES(V) \
9892
NODE_BUILTIN_ICU_MODULES(V) \
99-
NODE_BUILTIN_PROFILER_MODULES(V) \
100-
NODE_BUILTIN_DTRACE_MODULES(V)
93+
NODE_BUILTIN_PROFILER_MODULES(V)
10194

10295
// This is used to load built-in modules. Instead of using
10396
// __attribute__((constructor)), we call the _register_<modname>

‎src/node_config.cc

+1-7
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,7 @@ static void Initialize(Local<Object> target,
7575
READONLY_FALSE_PROPERTY(target, "noBrowserGlobals");
7676
#endif // NODE_NO_BROWSER_GLOBALS
7777

78-
READONLY_PROPERTY(target,
79-
"bits",
80-
Number::New(isolate, 8 * sizeof(intptr_t)));
81-
82-
#if defined HAVE_DTRACE || defined HAVE_ETW
83-
READONLY_TRUE_PROPERTY(target, "hasDtrace");
84-
#endif
78+
READONLY_PROPERTY(target, "bits", Number::New(isolate, 8 * sizeof(intptr_t)));
8579
} // InitConfig
8680

8781
} // namespace node

‎src/node_dtrace.cc

-323
This file was deleted.

‎src/node_dtrace.h

-86
This file was deleted.

‎src/node_external_reference.h

-7
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ class ExternalReferenceRegistry {
107107
#define EXTERNAL_REFERENCE_BINDING_LIST_INSPECTOR(V)
108108
#endif // HAVE_INSPECTOR
109109

110-
#if HAVE_DTRACE || HAVE_ETW
111-
#define EXTERNAL_REFERENCE_BINDING_LIST_DTRACE(V) V(dtrace)
112-
#else
113-
#define EXTERNAL_REFERENCE_BINDING_LIST_DTRACE(V)
114-
#endif
115-
116110
#if HAVE_OPENSSL
117111
#define EXTERNAL_REFERENCE_BINDING_LIST_CRYPTO(V) V(crypto) V(tls_wrap)
118112
#else
@@ -123,7 +117,6 @@ class ExternalReferenceRegistry {
123117
EXTERNAL_REFERENCE_BINDING_LIST_BASE(V) \
124118
EXTERNAL_REFERENCE_BINDING_LIST_INSPECTOR(V) \
125119
EXTERNAL_REFERENCE_BINDING_LIST_I18N(V) \
126-
EXTERNAL_REFERENCE_BINDING_LIST_DTRACE(V) \
127120
EXTERNAL_REFERENCE_BINDING_LIST_CRYPTO(V)
128121

129122
} // namespace node

‎src/node_provider.d

-80
This file was deleted.

‎src/node_win32_etw_provider-inl.h

-288
This file was deleted.

‎src/node_win32_etw_provider.cc

-213
This file was deleted.

‎src/node_win32_etw_provider.h

-99
This file was deleted.

‎src/res/node_etw_provider.man

-185
This file was deleted.

‎src/v8ustack.d

-695
This file was deleted.

‎test/parallel/test-bootstrap-modules.js

-6
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ const expectedModules = new Set([
5757
'NativeModule internal/console/constructor',
5858
'NativeModule internal/console/global',
5959
'NativeModule internal/constants',
60-
'NativeModule internal/dtrace',
6160
'NativeModule internal/encoding',
6261
'NativeModule internal/errors',
6362
'NativeModule internal/event_target',
@@ -235,11 +234,6 @@ if (common.hasCrypto) {
235234
expectedModules.add('NativeModule internal/streams/lazy_transform');
236235
}
237236

238-
const { internalBinding } = require('internal/test/binding');
239-
if (internalBinding('config').hasDtrace) {
240-
expectedModules.add('Internal Binding dtrace');
241-
}
242-
243237
const difference = (setA, setB) => {
244238
return new Set([...setA].filter((x) => !setB.has(x)));
245239
};

‎test/parallel/test-internal-dtrace.js

-24
This file was deleted.

‎tools/install.py

-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ def files(action):
144144
else:
145145
output_lib = 'libnode.' + variables.get('shlib_suffix')
146146
action([output_prefix + output_lib], 'lib/' + output_lib)
147-
if 'true' == variables.get('node_use_dtrace'):
148-
action(['out/Release/node.d'], 'lib/dtrace/node.d')
149147

150148
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
151149
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')

‎tools/msvs/msi/i18n/de-de.wxl

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<String Id="NodeRuntime_Title">Node.js-Laufzeitumgebung</String>
1313
<String Id="NodeRuntime_Description">Installation der [ProductName]-Laufzeitumgebung (node.exe).</String>
1414

15-
<String Id="NodeEtwSupport_Title">Event Tracing (ETW)</String>
16-
<String Id="NodeEtwSupport_Description">Installiert Unterstützung für Event Tracing (ETW)-Events, generiert von [ProductName].</String>
17-
1815
<String Id="npm_Title">npm-Paketmanager</String>
1916
<String Id="npm_Description">Installiert npm, den empfohlenen Paketmanager für [ProductName].</String>
2017

‎tools/msvs/msi/i18n/en-us.wxl

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
<String Id="NodeRuntime_Title">Node.js runtime</String>
2121
<String Id="NodeRuntime_Description">Install the core [ProductName] runtime (node.exe).</String>
2222

23-
<String Id="NodeEtwSupport_Title">Event tracing (ETW)</String>
24-
<String Id="NodeEtwSupport_Description">Installs support for event tracing (ETW) events generated by [ProductName].</String>
25-
2623
<String Id="npm_Title">npm package manager</String>
2724
<String Id="npm_Description">Install npm, the recommended package manager for [ProductName].</String>
2825

‎tools/msvs/msi/i18n/it-it.wxl

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<String Id="NodeRuntime_Title">Node.js runtime</String>
1313
<String Id="NodeRuntime_Description">Installa [ProductName] runtime (node.exe).</String>
1414

15-
<String Id="NodeEtwSupport_Title">Event tracing (ETW)</String>
16-
<String Id="NodeEtwSupport_Description">Installa il supporto per gli eventi "event tracing" (ETW) generati da [ProductName].</String>
17-
1815
<String Id="npm_Title">npm package manager</String>
1916
<String Id="npm_Description">Installa npm, il package manager raccomandato per [ProductName].</String>
2017

‎tools/msvs/msi/i18n/zh-cn.wxl

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<String Id="NodeRuntime_Title">Node.js 运行时</String>
1313
<String Id="NodeRuntime_Description">安装核心 [ProductName] 运行时（node.exe）。</String>
1414

15-
<String Id="NodeEtwSupport_Title">事件追踪（ETW）</String>
16-
<String Id="NodeEtwSupport_Description">为 [ProductName] 生成的事件安装事件追踪（ETW）的支持。</String>
17-
1815
<String Id="npm_Title">npm 包管理器</String>
1916
<String Id="npm_Description">安装 npm， [ProductName] 的推荐包管理器。</String>
2017

‎tools/msvs/msi/nodemsi.wixproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1717
<OutputPath>..\..\..\</OutputPath>
1818
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
19-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants>
19+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants>
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2222
<OutputPath>..\..\..\</OutputPath>
2323
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
24-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants>
24+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants>
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
2727
<OutputPath>..\..\..\</OutputPath>
2828
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
29-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
29+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
3030
<Cultures>en-US</Cultures>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
3333
<OutputPath>..\..\..\</OutputPath>
3434
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
35-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
35+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
3636
</PropertyGroup>
3737
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|arm64' ">
3838
<OutputPath>..\..\..\</OutputPath>
3939
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
40-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
40+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
4141
</PropertyGroup>
4242
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|arm64' ">
4343
<OutputPath>..\..\..\</OutputPath>
4444
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
45-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
45+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
4646
</PropertyGroup>
4747
<PropertyGroup>
4848
<EnableProjectHarvesting>True</EnableProjectHarvesting>

‎tools/msvs/msi/product.wxs

-15
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@
8080
<ComponentRef Id="InstallToolsBat" />
8181
<ComponentRef Id="SetInstallDirPermission" />
8282
<ComponentGroupRef Id="Product.Generated"/>
83-
84-
<Feature Id="NodeEtwSupport"
85-
Level="1"
86-
Title="!(loc.NodeEtwSupport_Title)"
87-
Description="!(loc.NodeEtwSupport_Description)">
88-
<ComponentRef Id="NodeEtwSupport"/>
89-
</Feature>
9083
</Feature>
9184

9285
<Feature Id="corepack"
@@ -175,14 +168,6 @@
175168
<Component Id="InstallToolsBat">
176169
<File Id="InstallToolsBat" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.bat"/>
177170
</Component>
178-
179-
<?if $(var.NoETW) != 1 ?>
180-
<Component Id="NodeEtwSupport">
181-
<File Id="node_etw_provider.man" Source="$(var.RepoDir)\src\res\node_etw_provider.man">
182-
<util:EventManifest MessageFile="[INSTALLDIR]node.exe" ResourceFile="[INSTALLDIR]node.exe"/>
183-
</File>
184-
</Component>
185-
<?endif?>
186171
</DirectoryRef>
187172

188173
<DirectoryRef Id="INSTALLDIR">

‎vcbuild.bat

+2-10
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ set lint_js=
4848
set lint_cpp=
4949
set lint_md=
5050
set lint_md_build=
51-
set noetw=
52-
set noetw_msi_arg=
5351
set i18n_arg=
5452
set download_arg=
5553
set build_release=
@@ -93,7 +91,6 @@ if /i "%1"=="sign" set sign=1&goto arg-ok
9391
if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
9492
if /i "%1"=="nonpm" set nonpm=1&goto arg-ok
9593
if /i "%1"=="nocorepack" set nocorepack=1&goto arg-ok
96-
if /i "%1"=="noetw" set noetw=1&goto arg-ok
9794
if /i "%1"=="ltcg" set ltcg=1&goto arg-ok
9895
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
9996
if /i "%1"=="test" set test_args=%test_args% %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok
@@ -190,7 +187,6 @@ if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
190187
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
191188
if defined nonpm set configure_flags=%configure_flags% --without-npm
192189
if defined nocorepack set configure_flags=%configure_flags% --without-corepack
193-
if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1
194190
if defined ltcg set configure_flags=%configure_flags% --with-ltcg
195191
if defined release_urlbase set configure_flags=%configure_flags% --release-urlbase=%release_urlbase%
196192
if defined download_arg set configure_flags=%configure_flags% %download_arg%
@@ -477,10 +473,6 @@ copy /Y ..\tools\msvs\nodevars.bat %TARGET_NAME%\ > nul
477473
if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
478474
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul
479475
if errorlevel 1 echo Cannot copy install_tools scripts && goto package_error
480-
if not defined noetw (
481-
copy /Y ..\src\res\node_etw_provider.man %TARGET_NAME%\ > nul
482-
if errorlevel 1 echo Cannot copy node_etw_provider.man && goto package_error
483-
)
484476
if defined dll (
485477
copy /Y libnode.dll %TARGET_NAME%\ > nul
486478
if errorlevel 1 echo Cannot copy libnode.dll && goto package_error
@@ -533,7 +525,7 @@ if not defined msi goto install-doctools
533525
echo Building node-v%FULLVERSION%-%target_arch%.msi
534526
set "msbsdk="
535527
if defined WindowsSDKVersion set "msbsdk=/p:WindowsTargetPlatformVersion=%WindowsSDKVersion:~0,-1%"
536-
msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build %msbsdk% /p:PlatformToolset=%PLATFORM_TOOLSET% /p:WixSdkDir="%WIXSDKDIR%" /p:Configuration=%config% /p:Platform=%target_arch% /p:NodeVersion=%NODE_VERSION% /p:FullVersion=%FULLVERSION% /p:DistTypeDir=%DISTTYPEDIR% %noetw_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
528+
msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build %msbsdk% /p:PlatformToolset=%PLATFORM_TOOLSET% /p:WixSdkDir="%WIXSDKDIR%" /p:Configuration=%config% /p:Platform=%target_arch% /p:NodeVersion=%NODE_VERSION% /p:FullVersion=%FULLVERSION% /p:DistTypeDir=%DISTTYPEDIR% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
537529
if errorlevel 1 goto exit
538530

539531
if not defined sign goto upload
@@ -772,7 +764,7 @@ set exit_code=1
772764
goto exit
773765

774766
:help
775-
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [noetw] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2019/vs2022] [download-all] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm]
767+
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2019/vs2022] [download-all] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm]
776768
echo Examples:
777769
echo vcbuild.bat : builds release build
778770
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
 (0)
Please sign in to comment.