refactor: convert to ESM benchmarks code

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/benchmarks/benchmarks-types.js b/benchmarks/benchmarks-types.mjs
similarity index 83%
rename from benchmarks/benchmarks-types.js
rename to benchmarks/benchmarks-types.mjs
index 4411fbbe3a4a39499e81bf45f5892905fafd7981..f7d8bdb9d9002b5d34169af5a61eb9fb192aab9e 100644 (file)
--- a/benchmarks/benchmarks-types.js
+++ b/benchmarks/benchmarks-types.mjs
@@ -15,4 +15,4 @@ const WorkerTypes = {
   cluster: 'cluster'
 }
 
-module.exports = { PoolTypes, WorkerFunctions, WorkerTypes }
+export { PoolTypes, WorkerFunctions, WorkerTypes }

diff --git a/benchmarks/benchmarks-utils.js b/benchmarks/benchmarks-utils.mjs
similarity index 95%
rename from benchmarks/benchmarks-utils.js
rename to benchmarks/benchmarks-utils.mjs
index 6195a983c3fe98da9e8f68e06dbc96818773c1fc..45e8cc0ea5882ae0804664d8f25e88f7265f6fe8 100644 (file)
--- a/benchmarks/benchmarks-utils.js
+++ b/benchmarks/benchmarks-utils.mjs
@@ -1,16 +1,12 @@
-const crypto = require('crypto')
-const fs = require('fs')
-const {
+import crypto from 'crypto'
+import fs from 'fs'
+import {
   DynamicClusterPool,
   DynamicThreadPool,
   FixedClusterPool,
   FixedThreadPool
-} = require('../lib')
-const {
-  PoolTypes,
-  WorkerFunctions,
-  WorkerTypes
-} = require('./benchmarks-types')
+} from '../lib/index.mjs'
+import { PoolTypes, WorkerFunctions, WorkerTypes } from './benchmarks-types.mjs'
 
 async function runTest (pool, { taskExecutions, workerData }) {
   return new Promise((resolve, reject) => {
@@ -151,7 +147,7 @@ function buildPool (workerType, poolType, poolSize, poolOptions) {
   }
 }
 
-module.exports = {
+export {
   WorkerFunctions,
   buildPool,
   executeWorkerFunction,

diff --git a/benchmarks/internal/bench.mjs b/benchmarks/internal/bench.mjs
index 6fad24c76a85f1878a95c843eadcefc1fbcc8977..fe34a220bd2e5165909502ab146e24e4eb007348 100644 (file)
--- a/benchmarks/internal/bench.mjs
+++ b/benchmarks/internal/bench.mjs
@@ -1,7 +1,11 @@
 import Benchmark from 'benny'
 import { WorkerChoiceStrategies } from '../../lib/index.mjs'
-import { PoolTypes, WorkerFunctions, WorkerTypes } from '../benchmarks-types.js'
-import { buildPool, runTest } from '../benchmarks-utils.js'
+import {
+  PoolTypes,
+  WorkerFunctions,
+  WorkerTypes
+} from '../benchmarks-types.mjs'
+import { buildPool, runTest } from '../benchmarks-utils.mjs'
 
 const poolSize = 30
 const taskExecutions = 1

diff --git a/benchmarks/internal/cluster-worker.mjs b/benchmarks/internal/cluster-worker.mjs
index 511ad2eb7011956875951e02e7000be94afbcf29..50e4a324a98a580206db83a3dc3dc40bf80efc32 100644 (file)
--- a/benchmarks/internal/cluster-worker.mjs
+++ b/benchmarks/internal/cluster-worker.mjs
@@ -1,7 +1,7 @@
 import { isMaster } from 'cluster'
 import { ClusterWorker } from '../../lib/index.mjs'
-import { executeWorkerFunction } from '../benchmarks-utils.js'
-import { WorkerFunctions } from '../benchmarks-types.js'
+import { executeWorkerFunction } from '../benchmarks-utils.mjs'
+import { WorkerFunctions } from '../benchmarks-types.mjs'
 
 const debug = false
 

diff --git a/benchmarks/internal/thread-worker.mjs b/benchmarks/internal/thread-worker.mjs
index 4f66a89a7356c49813c27ff2150839be5ad0356d..4e3c10500e0edc8fde098d49fc633d585336fc0a 100644 (file)
--- a/benchmarks/internal/thread-worker.mjs
+++ b/benchmarks/internal/thread-worker.mjs
@@ -1,7 +1,7 @@
 import { isMainThread } from 'worker_threads'
 import { ThreadWorker } from '../../lib/index.mjs'
-import { executeWorkerFunction } from '../benchmarks-utils.js'
-import { WorkerFunctions } from '../benchmarks-types.js'
+import { executeWorkerFunction } from '../benchmarks-utils.mjs'
+import { WorkerFunctions } from '../benchmarks-types.mjs'
 
 const debug = false
 

diff --git a/benchmarks/worker-selection/less.js b/benchmarks/worker-selection/less.mjs
similarity index 97%
rename from benchmarks/worker-selection/less.js
rename to benchmarks/worker-selection/less.mjs
index 3733cf6d336b5835979db48093823b126daf2559..e839107d0978cacb32f6d55521bcc4455e5615f0 100644 (file)
--- a/benchmarks/worker-selection/less.js
+++ b/benchmarks/worker-selection/less.mjs
@@ -1,5 +1,5 @@
-const Benchmark = require('benny')
-const { generateRandomInteger } = require('../benchmarks-utils')
+import Benchmark from 'benny'
+import { generateRandomInteger } from '../benchmarks-utils.mjs'
 
 function generateRandomTasksMap (
   numberOfWorkers,

diff --git a/benchmarks/worker-selection/round-robin.js b/benchmarks/worker-selection/round-robin.mjs
similarity index 97%
rename from benchmarks/worker-selection/round-robin.js
rename to benchmarks/worker-selection/round-robin.mjs
index 67d3a365e7e9f96394e46a970d97cced6689a2a0..b724a04ad5f6acc009bb86b0fd7e32318757a07b 100644 (file)
--- a/benchmarks/worker-selection/round-robin.js
+++ b/benchmarks/worker-selection/round-robin.mjs
@@ -1,4 +1,4 @@
-const Benchmark = require('benny')
+import Benchmark from 'benny'
 
 function generateWorkersArray (numberOfWorkers) {
   return [...Array(numberOfWorkers).keys()]