From 1ae7a3c3250d4d24490b61799eee3e07460d7bfb Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 18 Oct 2022 21:19:37 +0200
Subject: [PATCH] fix benchmarks

---
 benchmarks/main.ts   | 14 +++++++++-----
 benchmarks/worker.ts | 20 ++++++--------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/benchmarks/main.ts b/benchmarks/main.ts
index ccc8ce836f..bf5516cc0b 100644
--- a/benchmarks/main.ts
+++ b/benchmarks/main.ts
@@ -226,7 +226,9 @@ await new Command()
       workers.forEach((worker, i) => {
         worker.postMessage({ ...shared_config, i });
         worker.addEventListener("message", (evt: MessageEvent<any>) => {
-          jobSent[i] = evt.data
+          if (evt.data.type === "jobs_sent") {
+            jobSent[i] = evt.data.jobs_sent
+          }
         })
       });
       start = Date.now();
@@ -239,10 +241,12 @@ await new Command()
       let zombie_jobs = 0;
       workers.forEach((worker) => {
         const l = (evt: MessageEvent<any>) => {
-          zombie_jobs += evt.data;
-          worker.removeEventListener("message", l);
-          workers = workers.filter((w) => w != worker);
-          worker.terminate();
+          if (evt.data.type === "zombie_jobs") {
+            zombie_jobs += evt.data.zombie_jobs;
+            worker.removeEventListener("message", l);
+            workers = workers.filter((w) => w != worker);
+            worker.terminate();
+          }
         };
         worker.addEventListener("message", l);
         worker.postMessage(
diff --git a/benchmarks/worker.ts b/benchmarks/worker.ts
index 68e0ce3446..78e926e1f5 100644
--- a/benchmarks/worker.ts
+++ b/benchmarks/worker.ts
@@ -50,7 +50,7 @@ self.onmessage = (evt) => {
 
 
 const updateStatusInterval = setInterval(() => {
-  self.postMessage(total_spawned);
+  self.postMessage({ type: "jobs_sent", jobs_sent: total_spawned });
 }, 100)
 
 
@@ -112,29 +112,21 @@ const end_time = Date.now() + complete_timeout;
 while (outstanding.length > 0 && Date.now() < end_time) {
   const uuid = outstanding.shift()!;
   const r = await jobApi.getJob(config.workspace_id, uuid);
-  if (r.running) {
+  if (r.type == 'QueuedJob') {
     outstanding.push(uuid);
-    continue;
+    console.log(uuid)
   } else if (!config.useFlows) {
     try {
-      let result: string;
-      if (r.result) {
-        result = r.result;
-      } else {
-        const j = await jobApi.getCompletedJob(config.workspace_id, uuid);
-        result = j.result;
-      }
-      if (result != uuid) {
+      if (r.result != uuid) {
         console.log(
-          "job did not return correct UUID: " + result + " != " + uuid
+          "job did not return correct UUID: " + r.result + " != " + uuid
         );
       }
     } catch (e) {
       console.log("error during wait: ", e);
       outstanding.push(uuid);
-      continue;
     }
   }
 }
 
-self.postMessage(outstanding.length);
+self.postMessage({ type: "zombie_jobs", zombie_jobs: outstanding.length });