diff options
author | cjihrig <cjihrig@gmail.com> | 2019-03-02 16:53:32 -0500 |
---|---|---|
committer | cjihrig <cjihrig@gmail.com> | 2019-03-04 21:12:55 -0500 |
commit | 84ebaaa339ffc67cbada5b2ae59061c26efd39ce (patch) | |
tree | 43972aba3ac53d4c3cda4e258aa44918913e9b63 /test/common | |
parent | e6305698831a91bccb8bd24a8f216d68c15f703b (diff) | |
download | android-node-v8-84ebaaa339ffc67cbada5b2ae59061c26efd39ce.tar.gz android-node-v8-84ebaaa339ffc67cbada5b2ae59061c26efd39ce.tar.bz2 android-node-v8-84ebaaa339ffc67cbada5b2ae59061c26efd39ce.zip |
report: support RUSAGE_SELF stats on Windows
This commit adds support for the resourceUsage report section
on Windows by using uv_getrusage() instead of getrusage().
PR-URL: https://github.com/nodejs/node/pull/26406
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'test/common')
-rw-r--r-- | test/common/report.js | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/test/common/report.js b/test/common/report.js index 5655602fe8..22a905957e 100644 --- a/test/common/report.js +++ b/test/common/report.js @@ -43,9 +43,9 @@ function _validateContent(data) { // Verify that all sections are present as own properties of the report. const sections = ['header', 'javascriptStack', 'nativeStack', 'javascriptHeap', 'libuv', 'environmentVariables', - 'sharedObjects']; + 'sharedObjects', 'resourceUsage']; if (!isWindows) - sections.push('resourceUsage', 'userLimits'); + sections.push('userLimits'); if (report.uvthreadResourceUsage) sections.push('uvthreadResourceUsage'); @@ -133,26 +133,24 @@ function _validateContent(data) { }); }); - // Verify the format of the resourceUsage section on non-Windows platforms. - if (!isWindows) { - const usage = report.resourceUsage; - const resourceUsageFields = ['userCpuSeconds', 'kernelCpuSeconds', - 'cpuConsumptionPercent', 'maxRss', - 'pageFaults', 'fsActivity']; - checkForUnknownFields(usage, resourceUsageFields); - assert.strictEqual(typeof usage.userCpuSeconds, 'number'); - assert.strictEqual(typeof usage.kernelCpuSeconds, 'number'); - assert.strictEqual(typeof usage.cpuConsumptionPercent, 'number'); - assert(Number.isSafeInteger(usage.maxRss)); - assert(typeof usage.pageFaults === 'object' && usage.pageFaults !== null); - checkForUnknownFields(usage.pageFaults, ['IORequired', 'IONotRequired']); - assert(Number.isSafeInteger(usage.pageFaults.IORequired)); - assert(Number.isSafeInteger(usage.pageFaults.IONotRequired)); - assert(typeof usage.fsActivity === 'object' && usage.fsActivity !== null); - checkForUnknownFields(usage.fsActivity, ['reads', 'writes']); - assert(Number.isSafeInteger(usage.fsActivity.reads)); - assert(Number.isSafeInteger(usage.fsActivity.writes)); - } + // Verify the format of the resourceUsage section. + const usage = report.resourceUsage; + const resourceUsageFields = ['userCpuSeconds', 'kernelCpuSeconds', + 'cpuConsumptionPercent', 'maxRss', + 'pageFaults', 'fsActivity']; + checkForUnknownFields(usage, resourceUsageFields); + assert.strictEqual(typeof usage.userCpuSeconds, 'number'); + assert.strictEqual(typeof usage.kernelCpuSeconds, 'number'); + assert.strictEqual(typeof usage.cpuConsumptionPercent, 'number'); + assert(Number.isSafeInteger(usage.maxRss)); + assert(typeof usage.pageFaults === 'object' && usage.pageFaults !== null); + checkForUnknownFields(usage.pageFaults, ['IORequired', 'IONotRequired']); + assert(Number.isSafeInteger(usage.pageFaults.IORequired)); + assert(Number.isSafeInteger(usage.pageFaults.IONotRequired)); + assert(typeof usage.fsActivity === 'object' && usage.fsActivity !== null); + checkForUnknownFields(usage.fsActivity, ['reads', 'writes']); + assert(Number.isSafeInteger(usage.fsActivity.reads)); + assert(Number.isSafeInteger(usage.fsActivity.writes)); // Verify the format of the uvthreadResourceUsage section, if present. if (report.uvthreadResourceUsage) { |