perf_hooks: refactor to use more primordials

aduh95 · targos · commit 6adec6351e78 · 2021-06-11T09:29:17.000+02:00
PR-URL: #36297 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
@@ -2,12 +2,18 @@
 
 const {
 ArrayIsArray,
+ ArrayPrototypeFilter,
+ ArrayPrototypeIncludes,
+ ArrayPrototypeMap,
+ ArrayPrototypePush,
+ ArrayPrototypeSplice,
+ ArrayPrototypeUnshift,
 Boolean,
 NumberIsSafeInteger,
 ObjectDefineProperties,
 ObjectDefineProperty,
 ObjectKeys,
- Set,
+ SafeSet,
 Symbol,
 } = primordials;
 
@@ -383,7 +389,9 @@ class PerformanceObserver extends AsyncResource {
 if (!ArrayIsArray(entryTypes)) {
 throw new ERR_INVALID_OPT_VALUE('entryTypes', entryTypes);
 }
- const filteredEntryTypes = entryTypes.filter(filterTypes).map(mapTypes);
+ const filteredEntryTypes =
+ ArrayPrototypeMap(ArrayPrototypeFilter(entryTypes, filterTypes),
+ mapTypes);
 if (filteredEntryTypes.length === 0) {
 throw new ERR_VALID_PERFORMANCE_ENTRY_TYPE();
 }
@@ -410,7 +418,7 @@ class PerformanceObserver extends AsyncResource {
 class Performance {
 constructor() {
 this[kIndex] = {
- [kMarks]: new Set()
+ [kMarks]: new SafeSet()
 };
 }
 
@@ -577,7 +585,7 @@ function observersCallback(entry) {
 setupObservers(observersCallback);
 
 function filterTypes(i) {
- return observerableTypes.indexOf(`${i}`) >= 0;
+ return ArrayPrototypeIncludes(observerableTypes, `${i}`);
 }
 
 function mapTypes(i) {
@@ -615,15 +623,15 @@ function sortedInsert(list, entry) {
 const entryStartTime = entry.startTime;
 if (list.length === 0 ||
 (list[list.length - 1].startTime < entryStartTime)) {
- list.push(entry);
+ ArrayPrototypePush(list, entry);
 return;
 }
 if (list[0] && (list[0].startTime > entryStartTime)) {
- list.unshift(entry);
+ ArrayPrototypeUnshift(list, entry);
 return;
 }
 const location = getInsertLocation(list, entryStartTime);
- list.splice(location, 0, entry);
+ ArrayPrototypeSplice(list, location, 0, entry);
 }
 
 class ELDHistogram extends Histogram {

-Original file line number
+Diff line change
 const{
  ArrayIsArray,
 + ArrayPrototypeFilter,
 + ArrayPrototypeIncludes,
 + ArrayPrototypeMap,
 + ArrayPrototypePush,
 + ArrayPrototypeSplice,
 + ArrayPrototypeUnshift,
  Boolean,
  NumberIsSafeInteger,
  ObjectDefineProperties,
  ObjectDefineProperty,
  ObjectKeys,
 -Set,
 +SafeSet,
  Symbol,
 }=primordials;
 if(!ArrayIsArray(entryTypes)){
 thrownewERR_INVALID_OPT_VALUE('entryTypes',entryTypes);
+}
 -constfilteredEntryTypes=entryTypes.filter(filterTypes).map(mapTypes);
 +constfilteredEntryTypes=
 +ArrayPrototypeMap(ArrayPrototypeFilter(entryTypes,filterTypes),
 +mapTypes);
 if(filteredEntryTypes.length===0){
 thrownewERR_VALID_PERFORMANCE_ENTRY_TYPE();
+}
 classPerformance{
 constructor(){
 this[kIndex]={
 -[kMarks]: newSet()
 +[kMarks]: newSafeSet()
 };
+}
 setupObservers(observersCallback);
 functionfilterTypes(i){
 -returnobserverableTypes.indexOf(`${i}`)>=0;
 +returnArrayPrototypeIncludes(observerableTypes,`${i}`);
+}
 functionmapTypes(i){
 constentryStartTime=entry.startTime;
 if(list.length===0||
 (list[list.length-1].startTime<entryStartTime)){
 -list.push(entry);
 +ArrayPrototypePush(list,entry);
 return;
+}
 if(list[0]&&(list[0].startTime>entryStartTime)){
 -list.unshift(entry);
 +ArrayPrototypeUnshift(list,entry);
 return;
+}
 constlocation=getInsertLocation(list,entryStartTime);
 -list.splice(location,0,entry);
 +ArrayPrototypeSplice(list,location,0,entry);
+}
 classELDHistogramextendsHistogram{