lf-lang · lhstrh · Dec 23, 2022 · Sep 2, 2022 · Sep 3, 2022 · Sep 3, 2022
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java
@@ -1410,6 +1410,7 @@ public String toString() {
     public enum Platform {
         AUTO,
         ARDUINO("Arduino"),
+        NRF52("Nrf52"),
         LINUX("Linux"),
         MAC("Darwin"),
         WINDOWS("Windows");

diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -226,10 +226,10 @@ CodeBuilder generateCMakeCode(
         // Add additional flags so runtime can distinguish between multi-threaded and single-threaded mode
         if (targetConfig.threading) {
             cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
-            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_MULTI_THREADED)");
+            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
         } else {
             cMakeCode.pr("# Set flag to indicate a single-threaded runtime");
-            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_SINGLE_THREADED)");
+            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_UNTHREADED=1)");
         }
         cMakeCode.newLine();
 

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1104,8 +1104,7 @@ private void pickCompilePlatform() {
         // if platform target was set, use given platform instead
         if (targetConfig.platformOptions.platform != Platform.AUTO) {
             osName = targetConfig.platformOptions.platform.toString();
-        }
-        if (Stream.of("mac", "darwin", "win", "nux", "arduino").noneMatch(osName::contains)) {
+        } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
             errorReporter.reportError("Platform " + osName + " is not supported");
         }
     }
@@ -1831,7 +1830,7 @@ public void processProtoFile(String filename, CancelIndicator cancelIndicator) {
             List.of("--c_out="+this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
         if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires proto-c >= 1.3.3.");
+            errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
             return;
         }
         var returnCode = protoc.run(cancelIndicator);

diff --git a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
@@ -87,10 +87,6 @@ public static String generateDefineDirectives(
         code.pr("#define LOG_LEVEL " + logLevel);
         code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
 
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            code.pr("#define MICROSECOND_TIME");
-            code.pr("#define BIT_32");
-        }
         if (isFederated) {
             code.pr("#define NUMBER_OF_FEDERATES " + numFederates);
             code.pr(generateFederatedDefineDirective(coordinationType));
@@ -100,14 +96,19 @@ public static String generateDefineDirectives(
             }
         }
         if (tracing != null) {
-            targetConfig.compileDefinitions.put("LINGUA_FRANCA_TRACE", tracing.traceFileName);
+            targetConfig.compileDefinitions.put("LF_TRACE", tracing.traceFileName);
         }
         if (clockSyncIsOn) {
             code.pr(generateClockSyncDefineDirective(
                 targetConfig.clockSync,
                 targetConfig.clockSyncOptions
             ));
         }
+        if (targetConfig.threading) {
+            targetConfig.compileDefinitions.put("LF_THREADED", "1");
+        } else {
+            targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
+        }
         code.newLine();
         return code.toString();
     }

diff --git a/test/C/src/ManualDelayedReaction.lf b/test/C/src/ManualDelayedReaction.lf
@@ -25,7 +25,7 @@ reactor Source {
     output out: int
     timer t
 
-    // reaction(t) -> out after 100 msec {=
+    // reaction(t) -> out after 100 msec
     reaction(t) -> out {= lf_set(out, 1); =}
 }
 

diff --git a/test/C/src/SimpleDeadline.lf b/test/C/src/SimpleDeadline.lf
@@ -34,7 +34,7 @@ main reactor SimpleDeadline {
 
     reaction(start) -> d.x {=
         instant_t sleep_time_ns = 20000000;
-        lf_nanosleep(sleep_time_ns);
+        lf_sleep(sleep_time_ns);
         lf_set(d.x, 42);
     =}
 }
diff --git a/test/C/src/concurrent/AsyncCallback.lf b/test/C/src/concurrent/AsyncCallback.lf
@@ -26,7 +26,7 @@ main reactor AsyncCallback {
         // Simulate time passing before a callback occurs.
         void* take_time(void* a) {
             instant_t sleep_time = 100000000;
-            lf_nanosleep(sleep_time);
+            lf_sleep(sleep_time);
             callback(a);
             return NULL;
         }

diff --git a/test/C/src/concurrent/AsyncCallbackDrop.lf b/test/C/src/concurrent/AsyncCallbackDrop.lf
@@ -20,7 +20,7 @@ main reactor {
         // Simulate time passing before a callback occurs.
         void* take_time(void* a) {
             instant_t sleep_time = 100000000;
-            lf_nanosleep(sleep_time);
+            lf_sleep(sleep_time);
             callback(a);
             return NULL;
         }

diff --git a/test/C/src/concurrent/AsyncCallbackReplace.lf b/test/C/src/concurrent/AsyncCallbackReplace.lf
@@ -20,7 +20,7 @@ main reactor {
         // Simulate time passing before a callback occurs.
         void* take_time(void* a) {
             instant_t sleep_time = 100000000;
-            lf_nanosleep(sleep_time);
+            lf_sleep(sleep_time);
             callback(a);
             return NULL;
         }

diff --git a/test/C/src/federated/DistributedPhysicalActionUpstream.lf b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
@@ -21,7 +21,7 @@ preamble {=
     void* take_time(void* a) {
         while (_counter < 15) {
             instant_t sleep_time = MSEC(10);
-            lf_nanosleep(sleep_time);
+            lf_sleep(sleep_time);
             callback(a);
         }
         return NULL;

diff --git a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
@@ -21,7 +21,7 @@ preamble {=
     void* take_time(void* a) {
         while (_counter < 20) {
             instant_t sleep_time = USEC(50);
-            lf_nanosleep(sleep_time);
+            lf_sleep(sleep_time);
             callback(a);
         }
         return NULL;

diff --git a/test/C/src/federated/FeedbackDelay.lf b/test/C/src/federated/FeedbackDelay.lf
@@ -49,7 +49,7 @@ reactor Planner {
     output response: double
 
     reaction(request) -> response {=
-        lf_nanosleep(MSEC(10));
+        lf_sleep(MSEC(10));
         SET(response, request->value);
     =}
 }

diff --git a/test/Python/src/ManualDelayedReaction.lf b/test/Python/src/ManualDelayedReaction.lf
@@ -25,7 +25,7 @@ reactor Source {
     output out
     timer t
 
-    reaction(t) -> out {= out.set(1) =}  # reaction(t) -> out after 100 msec {=
+    reaction(t) -> out {= out.set(1) =}  # reaction(t) -> out after 100 msec
 }
 
 reactor Sink {

diff --git a/util/tracing/trace_to_chrome.c b/util/tracing/trace_to_chrome.c
@@ -30,7 +30,7 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * for viewing in Chrome's event visualizer. To visualize the resulting file,
  * point your chrome browser to chrome://tracing/ and the load the .json file.
  */
-#define LINGUA_FRANCA_TRACE
+#define LF_TRACE
 #include "reactor.h"
 #include "trace.h"
 #include "trace_util.h"

diff --git a/util/tracing/trace_to_csv.c b/util/tracing/trace_to_csv.c
@@ -29,7 +29,7 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Standalone program to convert a Lingua Franca trace file to a comma-separated values
  * text file.
  */
-#define LINGUA_FRANCA_TRACE
+#define LF_TRACE
 #include "reactor.h"
 #include "trace.h"
 #include "trace_util.h"

diff --git a/util/tracing/trace_to_influxdb.c b/util/tracing/trace_to_influxdb.c
@@ -108,7 +108,7 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * The data can then be viewed in the InfluxDB browser, or you can configure an external
  * tool such as Grafana to visualize it (see https://grafana.com/docs/grafana/latest/datasources/influxdb/).
  */
-#define LINGUA_FRANCA_TRACE
+#define LF_TRACE
 #include "reactor.h"
 #include "trace.h"
 #include "trace_util.h"

diff --git a/util/tracing/trace_util.c b/util/tracing/trace_util.c
@@ -29,7 +29,7 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Standalone program to convert a Lingua Franca trace file to a comma-separated values
  * text file.
  */
-#define LINGUA_FRANCA_TRACE
+#define LF_TRACE
 #include "reactor.h"
 #include "trace.h"
 #include "trace_util.h"

diff --git a/util/tracing/trace_util.h b/util/tracing/trace_util.h
@@ -29,7 +29,7 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Header file for common utilities used in converting Lingua Franca trace files
  * into other formats.
  */
-#define LINGUA_FRANCA_TRACE
+#define LF_TRACE
 #include "reactor.h"
 #include "trace.h"
+9 −2		.github/workflows/ci.yml
+6 −4		core/CMakeLists.txt
+3 −2		core/federated/RTI/CMakeLists.txt
+1 −1		core/federated/RTI/rti.c
+1 −1		core/federated/federate.c
+6 −5		core/federated/net_util.c
+5 −1		core/platform/CMakeLists.txt
+0 −3		core/platform/Platform.cmake
+166 −82		core/platform/lf_arduino_support.c
+28 −12		core/platform/lf_linux_support.c
+20 −8		core/platform/lf_macos_support.c
+297 −0		core/platform/lf_nrf52_support.c
+38 −0		core/platform/lf_os_single_threaded_support.c
+23 −183		core/platform/lf_windows_support.c
+53 −106		core/reactor.c
+68 −18		core/reactor_common.c
+41 −76		core/threaded/reactor_threaded.c
+7 −3		core/trace.c
+17 −17		include/core/federated/federate.h
+1 −1		include/core/federated/net_common.h
+5 −8		include/core/federated/net_util.h
+0 −4		include/core/lf_types.h
+66 −11		include/core/platform.h
+11 −1		include/core/platform/lf_POSIX_threads_support.h
+122 −115		include/core/platform/lf_arduino_support.h
+5 −4		include/core/platform/lf_linux_support.h
+2 −1		include/core/platform/lf_macos_support.h
+87 −0		include/core/platform/lf_nrf52_support.h
+189 −7		include/core/platform/lf_windows_support.h
+23 −0		include/core/reactor.h
+0 −34		include/core/tag.h
+1 −1		include/core/threaded/scheduler_sync_tag_advance.h
+2 −2		include/core/trace.h
+1 −0		lib/CMakeLists.txt
+1 −1		lingua-franca-ref.txt
+1 −0		test/CMakeLists.txt
+1 −0		test/Tests.cmake