@@ -234,12 +234,16 @@ function _validateContent(report, fields = []) {
234234 // Verify the format of the resourceUsage section.
235235 const usage = report . resourceUsage ;
236236 const resourceUsageFields = [ 'userCpuSeconds' , 'kernelCpuSeconds' ,
237- 'cpuConsumptionPercent' , 'maxRss' ,
237+ 'cpuConsumptionPercent' , 'userCpuConsumptionPercent' ,
238+ 'kernelCpuConsumptionPercent' , 'rss' , 'maxRss' ,
238239 'pageFaults' , 'fsActivity' ] ;
239240 checkForUnknownFields ( usage , resourceUsageFields ) ;
240241 assert . strictEqual ( typeof usage . userCpuSeconds , 'number' ) ;
241242 assert . strictEqual ( typeof usage . kernelCpuSeconds , 'number' ) ;
242243 assert . strictEqual ( typeof usage . cpuConsumptionPercent , 'number' ) ;
244+ assert . strictEqual ( typeof usage . userCpuConsumptionPercent , 'number' ) ;
245+ assert . strictEqual ( typeof usage . kernelCpuConsumptionPercent , 'number' ) ;
246+ assert ( Number . isSafeInteger ( usage . rss ) ) ;
243247 assert ( Number . isSafeInteger ( usage . maxRss ) ) ;
244248 assert ( typeof usage . pageFaults === 'object' && usage . pageFaults !== null ) ;
245249 checkForUnknownFields ( usage . pageFaults , [ 'IORequired' , 'IONotRequired' ] ) ;
@@ -254,11 +258,15 @@ function _validateContent(report, fields = []) {
254258 if ( report . uvthreadResourceUsage ) {
255259 const usage = report . uvthreadResourceUsage ;
256260 const threadUsageFields = [ 'userCpuSeconds' , 'kernelCpuSeconds' ,
257- 'cpuConsumptionPercent' , 'fsActivity' ] ;
261+ 'cpuConsumptionPercent' , 'fsActivity' ,
262+ 'userCpuConsumptionPercent' ,
263+ 'kernelCpuConsumptionPercent' ] ;
258264 checkForUnknownFields ( usage , threadUsageFields ) ;
259265 assert . strictEqual ( typeof usage . userCpuSeconds , 'number' ) ;
260266 assert . strictEqual ( typeof usage . kernelCpuSeconds , 'number' ) ;
261267 assert . strictEqual ( typeof usage . cpuConsumptionPercent , 'number' ) ;
268+ assert . strictEqual ( typeof usage . userCpuConsumptionPercent , 'number' ) ;
269+ assert . strictEqual ( typeof usage . kernelCpuConsumptionPercent , 'number' ) ;
262270 assert ( typeof usage . fsActivity === 'object' && usage . fsActivity !== null ) ;
263271 checkForUnknownFields ( usage . fsActivity , [ 'reads' , 'writes' ] ) ;
264272 assert ( Number . isSafeInteger ( usage . fsActivity . reads ) ) ;
0 commit comments