From c01986c7a532d8ada03af413f2a8a13baabf1a91 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Thu, 2 Dec 2021 16:51:29 -0600 Subject: [PATCH] [wip] rename the experiment to task_runner_streams --- .github/workflows/ci.yml | 4 ++-- dagger.nimble | 8 ++++---- ...localstore.nim => task_runner_streams.nim} | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) rename experiments/{localstore.nim => task_runner_streams.nim} (85%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04568373..a200db1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,9 +175,9 @@ jobs: run: | make test - - name: Build and run localstore experiment + - name: Build and run task_runner_streams experiment if: matrix.target.os != 'windows' shell: bash working-directory: nim-dagger run: | - ./env.sh nimble localstore + ./env.sh nimble task_runner_streams diff --git a/dagger.nimble b/dagger.nimble index e83600c0..42b5003d 100644 --- a/dagger.nimble +++ b/dagger.nimble @@ -39,7 +39,7 @@ task testAll, "Build & run Waku v1 tests": import os -task localstore, "Build localstore experiment": +task task_runner_streams, "Build task_runner_streams experiment": const build_opts = when defined(danger) or defined(release): @@ -58,7 +58,7 @@ task localstore, "Build localstore experiment": common_opts = " --define:ssl" & - " --out:build/localstore" & + " --out:build/task_runner_streams" & " --threads:on" & " --tlsEmulation:off" @@ -86,8 +86,8 @@ task localstore, "Build localstore experiment": (when host != "": " --define:host=" & host else: "") & (when maxRequestBodySize != "": " --define:maxRequestBodySize=" & maxRequestBodySize else: "") & (when port != "": " --define:port=" & port else: "") & - " experiments/localstore.nim", - "build/localstore" + " experiments/task_runner_streams.nim", + "build/task_runner_streams" ] for command in commands: diff --git a/experiments/localstore.nim b/experiments/task_runner_streams.nim similarity index 85% rename from experiments/localstore.nim rename to experiments/task_runner_streams.nim index 757be605..bd8611bb 100644 --- a/experiments/localstore.nim +++ b/experiments/task_runner_streams.nim @@ -4,20 +4,20 @@ import pkg/[chronicles, stew/byteutils, task_runner] import pkg/[chronos/apps/http/httpcommon, chronos/apps/http/httpserver] logScope: - topics = "localstore" + topics = "experiment" -type LocalstoreArg = ref object of ContextArg +type ExperimentArg = ref object of ContextArg const + experiment = "experiment" host {.strdefine.} = "127.0.0.1" - localstore = "localstore" maxRequestBodySize {.intdefine.} = 10 * 1_048_576 port {.strdefine.} = "30080" -proc localstoreContext(arg: ContextArg) {.async, gcsafe, nimcall, +proc experimentContext(arg: ContextArg) {.async, gcsafe, nimcall, raises: [Defect].} = - let contextArg = cast[LocalstoreArg](arg) + let contextArg = cast[ExperimentArg](arg) discard proc readFromStreamWriteToFile(rfd: int, destPath: string) @@ -56,7 +56,7 @@ proc main() {.async.} = createDir(destDir) var - localstoreArg = LocalstoreArg() + experimentArg = ExperimentArg() runner = TaskRunner.new runnerPtr {.threadvar.}: pointer @@ -88,7 +88,7 @@ proc main() {.async.} = else: (0, true) - asyncSpawn readFromStreamWriteToFile(runner, localstore, rfd.int, destPath) + asyncSpawn readFromStreamWriteToFile(runner, experiment, rfd.int, destPath) await request.getBodyReader.tryGet.readMessage(pred) await writer.closeWait discard request.respond(Http200) @@ -108,11 +108,11 @@ proc main() {.async.} = setControlCHook(stop) - runner.createWorker(pool, localstore, localstoreContext, localstoreArg, 8) - runner.workers[localstore].worker.awaitTasks = false + runner.createWorker(pool, experiment, experimentContext, experimentArg, 8) + runner.workers[experiment].worker.awaitTasks = false await runner.start server.start - asyncSpawn runner.scheduleStop(10.seconds) + # asyncSpawn runner.scheduleStop(10.seconds) while runner.running.load: poll()