diff options
author | James M Snell <jasnell@gmail.com> | 2018-08-23 10:16:00 -0700 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-09-19 11:07:01 +0200 |
commit | 9d71e6a6071134789a30471302d9735250dea96c (patch) | |
tree | 67a21cf09e3f5e3dd152ba22717ace87860e2f23 /tools | |
parent | 6e746f1a55e5d94f1a8330d3436a64ed8d6f639b (diff) | |
download | android-node-v8-9d71e6a6071134789a30471302d9735250dea96c.tar.gz android-node-v8-9d71e6a6071134789a30471302d9735250dea96c.tar.bz2 android-node-v8-9d71e6a6071134789a30471302d9735250dea96c.zip |
src: deprecate global COUNTER_* and remove perfctr
To support Performance Counters on Windows, a number of
global `COUNTER_` methods were added that are undocumented
and really only intended to be used internally by Node.js.
Unfortunately, the perfctr support apparently hasn't even
worked for quite a while and no one has even complained.
This removes the perfctr support and replaces the global
functions with deprecated non-ops for now, with the intent
of removing those outright in the next major release cycle.
PR-URL: https://github.com/nodejs/node/pull/22485
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: João Reis <reis@janeasystems.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/msvs/msi/i18n/de-de.wxl | 3 | ||||
-rw-r--r-- | tools/msvs/msi/i18n/en-us.wxl | 3 | ||||
-rw-r--r-- | tools/msvs/msi/i18n/it-it.wxl | 3 | ||||
-rw-r--r-- | tools/msvs/msi/i18n/zh-cn.wxl | 3 | ||||
-rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 8 | ||||
-rwxr-xr-x | tools/msvs/msi/product.wxs | 15 |
6 files changed, 4 insertions, 31 deletions
diff --git a/tools/msvs/msi/i18n/de-de.wxl b/tools/msvs/msi/i18n/de-de.wxl index 432d1eeaac..9983168a01 100644 --- a/tools/msvs/msi/i18n/de-de.wxl +++ b/tools/msvs/msi/i18n/de-de.wxl @@ -12,9 +12,6 @@ <String Id="NodeRuntime_Title">Node.js-Laufzeitumgebung</String> <String Id="NodeRuntime_Description">Installation der [ProductName]-Laufzeitumgebung (node.exe).</String> - <String Id="NodePerfCtrSupport_Title">Performance Counter</String> - <String Id="NodePerfCtrSupport_Description">Installiert Unterstützung für [ProductName]-spezifische Performance Counter.</String> - <String Id="NodeEtwSupport_Title">Event Tracing (ETW)</String> <String Id="NodeEtwSupport_Description">Installiert Unterstützung für Event Tracing (ETW)-Events, generiert von [ProductName].</String> diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index 71c1701491..e69ea7bbec 100644 --- a/tools/msvs/msi/i18n/en-us.wxl +++ b/tools/msvs/msi/i18n/en-us.wxl @@ -20,9 +20,6 @@ <String Id="NodeRuntime_Title">Node.js runtime</String> <String Id="NodeRuntime_Description">Install the core [ProductName] runtime (node.exe).</String> - <String Id="NodePerfCtrSupport_Title">Performance counters</String> - <String Id="NodePerfCtrSupport_Description">Installs support for [ProductName]-specific performance counters.</String> - <String Id="NodeEtwSupport_Title">Event tracing (ETW)</String> <String Id="NodeEtwSupport_Description">Installs support for event tracing (ETW) events generated by [ProductName].</String> diff --git a/tools/msvs/msi/i18n/it-it.wxl b/tools/msvs/msi/i18n/it-it.wxl index 54a251ea25..e3a5a5dcba 100644 --- a/tools/msvs/msi/i18n/it-it.wxl +++ b/tools/msvs/msi/i18n/it-it.wxl @@ -12,9 +12,6 @@ <String Id="NodeRuntime_Title">Node.js runtime</String> <String Id="NodeRuntime_Description">Installa [ProductName] runtime (node.exe).</String> - <String Id="NodePerfCtrSupport_Title">Performance counters</String> - <String Id="NodePerfCtrSupport_Description">Installa il supporto per i performance counters specifici di [ProductName].</String> - <String Id="NodeEtwSupport_Title">Event tracing (ETW)</String> <String Id="NodeEtwSupport_Description">Installa il supporto per gli eventi "event tracing" (ETW) generati da [ProductName].</String> diff --git a/tools/msvs/msi/i18n/zh-cn.wxl b/tools/msvs/msi/i18n/zh-cn.wxl index 605eea7092..e351436d05 100644 --- a/tools/msvs/msi/i18n/zh-cn.wxl +++ b/tools/msvs/msi/i18n/zh-cn.wxl @@ -12,9 +12,6 @@ <String Id="NodeRuntime_Title">Node.js 运行时</String> <String Id="NodeRuntime_Description">安装核心 [ProductName] 运行时(node.exe)。</String> - <String Id="NodePerfCtrSupport_Title">性能计数器</String> - <String Id="NodePerfCtrSupport_Description">为 [ProductName] 安装特定的性能计数器支持。</String> - <String Id="NodeEtwSupport_Title">事件追踪(ETW)</String> <String Id="NodeEtwSupport_Description">为 [ProductName] 生成的事件安装事件追踪(ETW)的支持。</String> diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index 892f19040a..6c23c1650b 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -16,23 +16,23 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> <Cultures>en-US</Cultures> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> </PropertyGroup> <PropertyGroup> <EnableProjectHarvesting>True</EnableProjectHarvesting> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index ad48fedafd..b21e86fc7c 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -76,13 +76,6 @@ <ComponentRef Id="InstallToolsTxt" /> <ComponentGroupRef Id="Product.Generated"/> - <Feature Id="NodePerfCtrSupport" - Level="1" - Title="!(loc.NodePerfCtrSupport_Title)" - Description="!(loc.NodePerfCtrSupport_Description)"> - <ComponentRef Id="NodePerfCtrSupport"/> - </Feature> - <Feature Id="NodeEtwSupport" Level="1" Title="!(loc.NodeEtwSupport_Title)" @@ -172,14 +165,6 @@ <File Id="InstallToolsTxt" Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.txt"/> </Component> - <?if $(var.NoPerfCtr) != 1 ?> - <Component Id="NodePerfCtrSupport"> - <File Id="node_perfctr_provider_man" Name="node_perfctr_provider.man" Source="$(var.RepoDir)\src\res\node_perfctr_provider.man"> - <util:PerfCounterManifest ResourceFileDirectory="[INSTALLDIR]"/> - </File> - </Component> - <?endif?> - <?if $(var.NoETW) != 1 ?> <Component Id="NodeEtwSupport"> <File Id="node_etw_provider.man" Source="$(var.RepoDir)\src\res\node_etw_provider.man"> |