Issue 1119 generator (#220)

* add handling of generator

fixes idrinth-api-bench/issues#1119

* add handling of generator

fixes idrinth-api-bench/issues#1119

Author: Idrinth

integration/executor-job.ts

@@ -1,27 +1,27 @@
 import mock from 'mock-fs';
-import executor from '../src/executor';
-import Thread from '../src/worker/thread';
+import executor from '../src/executor.js';
+import Thread from '../src/worker/thread.js';
 import {
   expect,
 } from 'chai';
 import 'mocha';
-import NullLogger from '../src/logger/null-logger';
-import Result from '../src/messaging/result';
-import FinishedSet from '../src/messaging/finished-set';
-import Task from '../src/routes/task';
-import ValidationResult from '../src/messaging/validation-result';
+import NullLogger from '../src/logger/null-logger.js';
+import Result from '../src/messaging/result.js';
+import FinishedSet from '../src/messaging/finished-set.js';
+import Task from '../src/routes/task.js';
+import ValidationResult from '../src/messaging/validation-result.js';
 import {
   realpathSync,
 } from 'fs';
-import Job from '../src/routes/job';
-import NoopStorage from '../src/storage/noop-storage';
+import Job from '../src/routes/job.js';
+import NoopStorage from '../src/storage/noop-storage.js';
 import makeConsoleMock from 'consolemock';
-import NoProgress from '../src/progress/no-progress';
-import Counter from '../src/helper/counter';
+import NoProgress from '../src/progress/no-progress.js';
+import Counter from '../src/helper/counter.js';
 import {
   TEMP_DIR,
-} from '../src/constants';
-import prepareTempDir from './prepare-temp-dir';
+} from '../src/constants.js';
+import prepareTempDir from './prepare-temp-dir.js';
 
 const NONE = 0;
 const SETUP_TIMEOUT = 10000;
@@ -56,6 +56,8 @@ class FakeResult implements Result, ValidationResult, FinishedSet {
 
   public stdv100: number;
 
+  public maxDuration: number;
+
   public response = {
     headers: {},
     cookies: {},
@@ -66,7 +68,7 @@ class FakeResult implements Result, ValidationResult, FinishedSet {
 
   public validators = [];
 
-  public durations;
+  public durations: number[];
 
   public msgs = {};
 

src/executor.ts

@@ -20,7 +20,6 @@ import Thread from './worker/thread.js';
 import {
   EMPTY,
 } from './constants.js';
-import Task from './routes/task.js';
 import buildTaskList from './routes/build-task-list.js';
 
 /* eslint max-params:0 */
@@ -48,7 +47,7 @@ const executor = async(
   logger.debug(
     language('initialization', `${ repetitions }`, `${ threads }`,),
   );
-  const internalTasks: Task[] = buildTaskList(job.main, blacklist, total,);
+  const internalTasks = buildTaskList(job.main, blacklist, total,);
   progress.start(job, repetitions, threads,);
   const calculator = buildWorker(
     Worker,
@@ -97,7 +96,7 @@ const executor = async(
         ),
       );
       Counter.increment('active',);
-      worker.postMessage(internalTasks.shift(),);
+      worker.postMessage(internalTasks.next().value,);
     }
   };
   const before = buildWorker(

src/messaging/worker.ts

@@ -58,7 +58,7 @@ const onWorker = (
   results: {[z: string]: ResultSet},
   total: number,
   calculator: Thread,
-  internalTasks: Task[],
+  internalTasks: Generator<Task>,
   worker: Thread,
   after: Thread,
   job: Job,
@@ -69,9 +69,10 @@ const onWorker = (
   results[data.id].add(data,);
   progress.increment();
   startAnalyzing(data.id, total, logger, calculator, results,);
-  if (internalTasks.length > EMPTY) {
+  let next: Task|undefined = internalTasks.next().value;
+  if (next) {
     logger.debug(language('next_request',),);
-    worker.postMessage(internalTasks.shift(),);
+    worker.postMessage(next,);
     return;
   }
   Counter.decrement('active',);

src/routes/build-task-list.ts

@@ -1,7 +1,6 @@
 import Task from './task.js';
 
-export default (tasks: Task[], blacklist: string[], total: number,) => {
-  const internalTasks = [];
+export default function *(tasks: Task[], blacklist: string[], total: number,) {
   for (const task of tasks) {
     if (task.pre) {
       task.pre = task.pre.filter((entry,) => ! blacklist.includes(entry,),);
@@ -10,8 +9,7 @@ export default (tasks: Task[], blacklist: string[], total: number,) => {
       task.post = task.post.filter((entry,) => ! blacklist.includes(entry,),);
     }
     for (let i = 0; i < total; i ++) {
-      internalTasks.push(task,);
+      yield task;
     }
   }
-  return internalTasks;
 };