Merge remote-tracking branch 'origin/master' into zepyhr-kconfig

lf-lang · Apr 12, 2024 · 3a64507 · 3a64507
2 parents bb445c0 + 2179837
commit 3a64507
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 48 deletions.
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
@@ -51,10 +51,11 @@ jobs:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-node${{ matrix.node-version }}-${{ hashFiles('core/src/main/resources/lib/ts/package.json') }}
       - name: Setup Rust
-        uses: ATiltedTree/setup-rust@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          rust-version: nightly
+          toolchain: stable
           components: clippy
+          rustflags: "" # don't use -D warnings
       - name: Install Dependencies Ubuntu
         run: |
           sudo apt-get install libprotobuf-dev protobuf-compiler libprotobuf-c-dev protobuf-c-compiler

diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
@@ -50,20 +50,22 @@ jobs:
         if: inputs.runtime-ref
       - name: Setup Rust
         id: rustup
-        uses: ATiltedTree/setup-rust@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          rust-version: ${{ matrix.rust }}
+          toolchain: ${{ matrix.rust }}
           components: clippy
+          rustflags: "" # don't use -D warnings
         continue-on-error: true
       - name: Delete rustup cache
         run: rm -r ~/.rustup
         if: ${{ steps.rustup.outcome }} != "success"
       - name: Setup Rust (again)
         if: ${{ steps.rustup.outcome }} != "success"
-        uses: ATiltedTree/setup-rust@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          rust-version: ${{ matrix.rust }}
+          toolchain: ${{ matrix.rust }}
           components: clippy
+          rustflags: "" # don't use -D warnings
       - name: Run Rust tests
         run: ./gradlew targetTest -Ptarget=Rust
       - name: Report to CodeCov

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -203,7 +203,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
             });
 
     context.finish(Status.COMPILED, codeMapMap);
-    return false;
+    return context.getErrorReporter().getErrorsOccurred();
   }
 
   /**
@@ -218,9 +218,14 @@ private void buildUsingDocker(LFGeneratorContext context, List<SubContext> subCo
       dockerGen.writeDockerComposeFile(createDockerFiles(context, subContexts));
       if (dockerGen.build()) {
         dockerGen.createLauncher();
+      } else {
+        context.getErrorReporter().nowhere().error("Docker build failed.");
       }
     } catch (IOException e) {
-      context.getErrorReporter().nowhere().error("Unsuccessful Docker build.");
+      context
+          .getErrorReporter()
+          .nowhere()
+          .error("Docker build failed due to invalid file system state.");
     }
   }
 
@@ -237,8 +242,7 @@ private void prepareRtiBuildEnvironment(LFGeneratorContext context) {
       try {
         Files.createDirectories(dest);
         // 2. Copy reactor-c source files into it
-        FileUtil.copyFromClassPath("/lib/c/reactor-c/core", dest, true, false);
-        FileUtil.copyFromClassPath("/lib/c/reactor-c/include", dest, true, false);
+        FileUtil.copyFromClassPath("/lib/c/reactor-c", dest, true, true);
         // 3. Generate a Dockerfile for the rti
         new RtiDockerGenerator(context).generateDockerData(dest).writeDockerFile();
       } catch (IOException e) {

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -523,7 +523,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
             context.getMode());
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else if (dockerBuild.enabled()) {
-        buildUsingDocker();
+        boolean success = buildUsingDocker();
+        if (!success) {
+          context.unsuccessfulFinish();
+        }
       } else {
         var cleanCode = code.removeLines("#line");
         var cCompiler = new CCompiler(targetConfig, fileConfig, messageReporter, cppMode);
@@ -557,7 +560,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
   }
 
   /** Create Dockerfiles and docker-compose.yml, build, and create a launcher. */
-  private void buildUsingDocker() {
+  private boolean buildUsingDocker() {
     // Create docker file.
     var dockerCompose = new DockerComposeGenerator(context);
     var dockerData = getDockerGenerator(context).generateDockerData();
@@ -568,9 +571,13 @@ private void buildUsingDocker() {
       throw new RuntimeException("Error while writing Docker files", e);
     }
     var success = dockerCompose.build();
+    if (!success) {
+      messageReporter.nowhere().error("Docker-compose build failed.");
+    }
     if (success && mainDef != null) {
       dockerCompose.createLauncher();
     }
+    return success;
   }
 
   private void generateCodeFor(String lfModuleName) throws IOException {

diff --git a/core/src/main/java/org/lflang/generator/docker/DockerComposeGenerator.java b/core/src/main/java/org/lflang/generator/docker/DockerComposeGenerator.java
@@ -125,7 +125,9 @@ public void createLauncher() {
     var fileConfig = context.getFileConfig();
     var packageRoot = fileConfig.srcPkgPath;
     var srcGenPath = fileConfig.getSrcGenPath();
-    var file = fileConfig.binPath.resolve(fileConfig.name).toFile();
+    var binPath = fileConfig.binPath;
+    FileUtil.createDirectoryIfDoesNotExist(binPath.toFile());
+    var file = binPath.resolve(fileConfig.name).toFile();
     var script =
         """
         #!/bin/bash
@@ -142,7 +144,9 @@ public void createLauncher() {
       writer.write(script);
       writer.close();
     } catch (IOException e) {
-      messageReporter.nowhere().warning("Unable to write launcher to: " + file.getAbsolutePath());
+      messageReporter
+          .nowhere()
+          .warning("Unable to write launcher to " + file.getAbsolutePath() + " with error: " + e);
     }
 
     if (!file.setExecutable(true, false)) {

diff --git a/core/src/main/java/org/lflang/generator/docker/RtiDockerGenerator.java b/core/src/main/java/org/lflang/generator/docker/RtiDockerGenerator.java
@@ -1,5 +1,9 @@
 package org.lflang.generator.docker;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.stream.Collectors;
 import org.lflang.generator.LFGeneratorContext;
 
 /**
@@ -15,24 +19,12 @@ public RtiDockerGenerator(LFGeneratorContext context) {
 
   @Override
   protected String generateDockerFileContent() {
-    return """
-        # Docker file for building the image of the rti
-        FROM %s
-        COPY core /reactor-c/core
-        COPY include /reactor-c/include
-        WORKDIR /reactor-c/core/federated/RTI
-        %s
-        RUN rm -rf build && \\
-            mkdir build && \\
-            cd build && \\
-            cmake ../ && \\
-            make && \\
-            make install
-
-        # Use ENTRYPOINT not CMD so that command-line arguments go through
-        ENTRYPOINT ["RTI"]
-        """
-        .formatted(baseImage(), generateRunForBuildDependencies());
+    InputStream stream =
+        RtiDockerGenerator.class.getResourceAsStream(
+            "/lib/c/reactor-c/core/federated/RTI/rti.Dockerfile");
+    return new BufferedReader(new InputStreamReader(stream))
+        .lines()
+        .collect(Collectors.joining("\n"));
   }
 
   @Override

diff --git a/core/src/main/java/org/lflang/generator/docker/TSDockerGenerator.java b/core/src/main/java/org/lflang/generator/docker/TSDockerGenerator.java
@@ -17,11 +17,11 @@ public TSDockerGenerator(LFGeneratorContext context) {
   /** Return the content of the docker file for [tsFileName]. */
   public String generateDockerFileContent() {
     return """
-        |FROM %s
-        |WORKDIR /linguafranca/$name
-        |%s
-        |COPY . .
-        |ENTRYPOINT ["node", "dist/%s.js"]
+        FROM %s
+        WORKDIR /linguafranca/$name
+        %s
+        COPY . .
+        ENTRYPOINT ["node", "dist/%s.js"]
         """
         .formatted(baseImage(), generateRunForBuildDependencies(), context.getFileConfig().name);
   }

diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt
@@ -67,8 +67,6 @@ ${"         |"..gen.crate.modulesToIncludeInMain.joinWithLn { "mod ${it.fileName
             |
             |struct CliParseResult(SchedulerOptions, __MainParams, LevelFilter);
             |
-            |const DEFAULT_LOG_LEVEL: LevelFilter = LevelFilter::Warn;
-            |
             |fn main() {
             |    let CliParseResult(options, main_args, log_level) = cli::parse();
             |
@@ -139,7 +137,7 @@ ${"         |           "..mainReactor.ctorParams.joinWithCommasLn { (it.default
             |        );
             |
             |        let level_by_env = std::env::var("RUST_LOG").ok().and_then(|e| e.as_str().parse::<::log::LevelFilter>().ok());
-            |        let log_level = level_by_env.unwrap_or(DEFAULT_LOG_LEVEL);
+            |        let log_level = level_by_env.unwrap_or(LevelFilter::Warn);
             |
             |        CliParseResult(options, main_args, log_level)
             |    }

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -381,6 +381,13 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
         FileConfig.findPackageRoot(test.getSrcPath(), s -> {})
             .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
             .toString());
+
+    // Update the test by applying the transformation.
+    if (transformer != null) {
+      if (!transformer.transform(resource)) {
+        throw new TestError("Test transformation unsuccessful.", Result.TRANSFORM_FAIL);
+      }
+    }
     var context =
         new MainContext(
             LFGeneratorContext.Mode.STANDALONE,
@@ -391,13 +398,6 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
 
-    // Update the test by applying the transformation.
-    if (transformer != null) {
-      if (!transformer.transform(resource)) {
-        throw new TestError("Test transformation unsuccessful.", Result.TRANSFORM_FAIL);
-      }
-    }
-
     // Reload the context because properties may have changed as part of the transformation.
     test.loadContext(context);
+46 −21		core/environment.c
+1 −2		core/federated/RTI/rti.Dockerfile
+23 −31		core/federated/federate.c
+7 −18		core/modal_models/modes.c
+6 −12		core/reactor.c
+65 −195		core/reactor_common.c
+14 −19		core/threaded/reactor_threaded.c
+6 −15		core/utils/pqueue.c
+27 −17		core/utils/pqueue_base.c
+0 −114		core/utils/pqueue_support.h
+19 −15		core/utils/pqueue_tag.c
+2 −3		include/core/environment.h
+1 −1		include/core/federated/federate.h
+3 −6		include/core/federated/network/net_common.h
+4 −6		include/core/lf_types.h
+9 −10		include/core/reactor_common.h
+5 −35		include/core/utils/pqueue.h
+14 −8		include/core/utils/pqueue_base.h
+42 −1		include/core/utils/pqueue_tag.h
+31 −37		lib/schedule.c
+3 −0		tag/api/tag.h