diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml index 68330269b5..0d6e1c85b0 100644 --- a/.github/workflows/ts-tests.yml +++ b/.github/workflows/ts-tests.yml @@ -38,7 +38,7 @@ jobs: if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform TypeScript tests run: | - ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#dnet-ad-hoc" + ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master" - name: Report to CodeCov uses: ./.github/actions/report-code-coverage with: diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java index 6ccb6fd8ca..4f824ebc80 100644 --- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java +++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java @@ -324,7 +324,7 @@ private String getRtiCommand(List federates, boolean isRemote) if (targetConfig.getOrDefault(TracingProperty.INSTANCE).isEnabled()) { commands.add(" -t \\"); } - if (targetConfig.getOrDefault(DNETProperty.INSTANCE)) { + if (!targetConfig.getOrDefault(DNETProperty.INSTANCE)) { commands.add(" -d \\"); } commands.addAll( diff --git a/core/src/main/java/org/lflang/target/property/DNETProperty.java b/core/src/main/java/org/lflang/target/property/DNETProperty.java index 958282cf69..9d34cca7b3 100644 --- a/core/src/main/java/org/lflang/target/property/DNETProperty.java +++ b/core/src/main/java/org/lflang/target/property/DNETProperty.java @@ -1,8 +1,11 @@ package org.lflang.target.property; /** - * If true, the RTI sends DNET signals during the execution of federation. The default is ture (for - * now, for testing). + * @brief Target property turning on or off the DNET signal optimization. + * + * If this target property is true, the RTI sends DNET (downstream next event tag) signals to an upstream federate + * to tell the federate that sending LTC and NET signals with tags less than the specified value is unnecessary. + * The default is true. */ public final class DNETProperty extends BooleanProperty { diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 05280d0f54..c2f5316458 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 05280d0f5488058693e18863725bcd1e5fe68a29 +Subproject commit c2f5316458bac61074285ca34d92a87c8511eaf9