From ce506ff5ed221e43ad9d27da74cb201076d7161d Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Thu, 10 Mar 2022 17:57:00 -0800 Subject: [PATCH] Remove threads target properties from templates. How come this was not caught in other branches? --- .../org/lflang/ui/wizard/templates/c/src/Interactive.lf | 1 - .../src/org/lflang/ui/wizard/templates/c/src/Parallel.lf | 4 ++-- .../src/org/lflang/ui/wizard/templates/c/src/Pipeline.lf | 8 ++++---- .../org/lflang/ui/wizard/templates/c/src/ReflexGame.lf | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Interactive.lf b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Interactive.lf index 6041462bd8..ef705d0bf5 100644 --- a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Interactive.lf +++ b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Interactive.lf @@ -3,7 +3,6 @@ * This has no audio output, but just tests the ncurses interface. */ target C { - threads: 2, cmake-include: [ "include/ncurses-cmake-extension.txt", // Adds support for ncurses "/lib/c/reactor-c/util/sensor_simulator.cmake" diff --git a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Parallel.lf b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Parallel.lf index a66ab5f00c..5e62ff66cd 100644 --- a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Parallel.lf +++ b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Parallel.lf @@ -3,13 +3,13 @@ * transport the input to the output. Four of them are * instantiated. Note that without parallel execution, there is * no way this program can keep up with real time since in every - * 200 msec cycle it has 800 msec of work to do. Given 4 threads, + * 200 msec cycle it has 800 msec of work to do. Given 4 workers, * however, this program can complete 800 msec of work in about * 225 msec. */ target C { timeout: 2 sec, - threads: 1, // Change to 4 to see speed up. + workers: 1, // Change to 4 to see speed up. }; reactor Source { timer t(0, 200 msec); diff --git a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Pipeline.lf b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Pipeline.lf index 76932c5636..87501f13e0 100644 --- a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Pipeline.lf +++ b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/Pipeline.lf @@ -3,19 +3,19 @@ * a chain of reactors that can all execute in parallel * at each logical time step. * - * The threads argument specifies the number of worker - * threads, which enables the reactors in the chain to + * The workers argument specifies the number of worker + * workers, which enables the reactors in the chain to * execute on multiple cores simultaneously. * * This uses the TakeTime reactor to perform computation. - * If you reduce the number of worker threads to 1, the + * If you reduce the number of worker workers to 1, the * execution time will be approximately four times as long. * * @author Edward A. Lee * @author Marten Lohstroh */ target C { - threads: 4, + workers: 4, } /** diff --git a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/ReflexGame.lf b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/ReflexGame.lf index a342da1d58..16a65b0527 100644 --- a/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/ReflexGame.lf +++ b/org.lflang.ui/src/org/lflang/ui/wizard/templates/c/src/ReflexGame.lf @@ -12,7 +12,6 @@ * @author Marten Lohstroh */ target C { - threads: 1, keepalive: true }; /**