Merge branch 'master' into cmake-init-include

lf-lang · Jan 22, 2025 · f708f10 · f708f10
2 parents 1062324 + 7b431ea
commit f708f10
Show file tree

Hide file tree

Showing 51 changed files with 353 additions and 180 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
   build-toolchain:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
@@ -25,7 +25,7 @@ jobs:
   arduino-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/c-embedded.yml b/.github/workflows/c-embedded.yml
@@ -25,5 +25,5 @@ jobs:
 #     uses: ./.github/workflows/c-flexpret-tests.yml
 
       # Run the C Patmos integration tests.
-  patmos:
-    uses: ./.github/workflows/c-patmos-tests.yml
+#  patmos:
+#    uses: ./.github/workflows/c-patmos-tests.yml
diff --git a/.github/workflows/c-flexpret-tests.yml b/.github/workflows/c-flexpret-tests.yml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   flexpret-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -45,7 +45,7 @@ jobs:
         if: ${{ inputs.runtime-ref }}
       - name: Run FlexPRET smoke tests
         run: |
-          cd "$FP_DIR" && source env.bash && cd -
+          source $FP_DIR/env.bash
           ./gradlew core:integrationTest \
             --tests org.lflang.tests.runtime.CFlexPRETTest.* \
             core:integrationTestCodeCoverageReport

diff --git a/.github/workflows/c-patmos-tests.yml b/.github/workflows/c-patmos-tests.yml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   Patmos-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
@@ -25,7 +25,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 120
     steps:

diff --git a/.github/workflows/c-verifier-tests.yml b/.github/workflows/c-verifier-tests.yml
@@ -15,7 +15,7 @@ jobs:
   run:
     strategy:
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-24.04]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   zephyr-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -46,16 +46,16 @@ jobs:
             --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrThreaded* core:integrationTestCodeCoverageReport
           ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
           rm -rf test/C/src-gen
-      - name: Run basic tests
-        run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
-          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-          rm -rf test/C/src-gen
-      - name: Run concurrent tests
-        run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
-          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-          rm -rf test/C/src-gen
+      # - name: Run basic tests
+      #   run: |
+      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
+      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+      #     rm -rf test/C/src-gen
+      # - name: Run concurrent tests
+      #   run: |
+      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
+      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+      #     rm -rf test/C/src-gen
       - name: Run Zephyr board tests
         run: |
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport

diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   cancel:
     name: run
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 3
     steps:
       - uses: styfle/[email protected]

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
@@ -30,7 +30,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       skip: ${{ steps.should-skip.outputs.skip == 'true' }}
       run_c: ${{ steps.do.outputs.changed_c == 1 || !github.event.pull_request.draft }}

diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check that a label has been assigned
         uses: mheap/github-action-required-labels@v5

diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
@@ -12,7 +12,7 @@ jobs:
   test-cli:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   cpp-ros2-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
@@ -18,7 +18,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 120
     steps:
@@ -39,7 +39,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y clang-tidy
           sudo apt-get install -y lcov
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
       - name: Check out specific ref of reactor-cpp
         uses: actions/checkout@v2
         with:
@@ -60,15 +60,15 @@ jobs:
           lcov --capture --directory test/Cpp --output-file coverage.info
           lcov --extract coverage.info ${GITHUB_WORKSPACE}/test/Cpp/src-gen/reactor-cpp-default/\* --output-file reactor-cpp.info
           genhtml reactor-cpp.info --output-directory reactor-cpp.coverage
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
       - name: Upload coverage report
         uses: actions/upload-artifact@v3
         with:
           name: reactor-cpp.coverage
           path: reactor-cpp.coverage
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:
           files: reactor-cpp.info
-        if: ${{ github.repository == 'lf-lang/lingua-franca' && matrix.platform == 'ubuntu-latest' }}
+        if: ${{ github.repository == 'lf-lang/lingua-franca' && matrix.platform == 'ubuntu-24.04' }}
diff --git a/.github/workflows/custom-build.yml b/.github/workflows/custom-build.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   custom-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/extract-ref.yml b/.github/workflows/extract-ref.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   extract-ref:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       ref: ${{ steps.read.outputs.ref }}
     steps:

diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
@@ -32,7 +32,7 @@ on:
 
 jobs:
   get-latest-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       ref: ${{ steps.semver.outputs.ref }}
       ver: ${{ steps.semver.outputs.ver }}

diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
@@ -16,7 +16,7 @@ jobs:
   test-lsp:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       # Uninstall operations are needed because the language server is able to use multiple
@@ -69,7 +69,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: Run language server Python tests without PyLint
         run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly core:integrationTestCodeCoverageReport
       - name: Install pylint

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   nightly-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
@@ -21,7 +21,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Install dependencies OS X
         run: |
           brew install coreutils

diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
@@ -24,7 +24,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
         rust: [stable]
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 60

diff --git a/.github/workflows/rti-docker.yml b/.github/workflows/rti-docker.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Build and push RTI to Docker Hub
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   serialization-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
@@ -12,7 +12,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 120
     steps:

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -520,6 +520,7 @@ public String generatePreamble(
     includes.pr("#include \"core/federated/federate.h\"");
     includes.pr("#include \"core/federated/network/net_common.h\"");
     includes.pr("#include \"core/federated/network/net_util.h\"");
+    includes.pr("#include \"core/federated/network/socket_common.h\"");
     includes.pr("#include \"core/federated/clock-sync.h\"");
     includes.pr("#include \"core/threaded/reactor_threaded.h\"");
     includes.pr("#include \"core/utils/util.h\"");
@@ -542,6 +543,7 @@ protected String makePreamble(
     code.pr("#include \"core/federated/federate.h\"");
     code.pr("#include \"core/federated/network/net_common.h\"");
     code.pr("#include \"core/federated/network/net_util.h\"");
+    code.pr("#include \"core/federated/network/socket_common.h\"");
     code.pr("#include \"core/federated/clock-sync.h\"");
     code.pr("#include \"core/threaded/reactor_threaded.h\"");
     code.pr("#include \"core/utils/util.h\"");

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -313,6 +313,7 @@ public static void generateCMakeInclude(
         "add_compile_definitions(LF_PACKAGE_DIRECTORY=\"" + fileConfig.srcPkgPath + "\")");
     cmakeIncludeCode.pr(
         "add_compile_definitions(LF_SOURCE_GEN_DIRECTORY=\"" + fileConfig.getSrcGenPath() + "\")");
+    cmakeIncludeCode.pr("add_compile_definitions(LF_FILE_SEPARATOR=\"" + File.separator + "\")");
     try (var srcWriter = Files.newBufferedWriter(cmakeIncludePath)) {
       srcWriter.write(cmakeIncludeCode.getCode());
     }

diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -85,6 +85,11 @@ protected String generateSerializationIncludes(
     return code.getCode();
   }
 
+  @Override
+  public String getNetworkBufferType() {
+    return "PyObject*";
+  }
+
   @Override
   public String generateNetworkSenderBody(
       VarRef sendingPort,