Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ignore me] Revert "A target property for handling downstream next event tag (DNET) signal" #2463

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ts-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ 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#master"
./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:
Expand Down
18 changes: 0 additions & 18 deletions core/src/main/java/org/lflang/federated/extensions/CExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.lflang.federated.generator.FederationFileConfig;
import org.lflang.federated.launcher.RtiConfig;
import org.lflang.federated.serialization.FedROS2CPPSerialization;
import org.lflang.generator.ActionInstance;
import org.lflang.generator.CodeBuilder;
import org.lflang.generator.LFGeneratorContext;
import org.lflang.generator.ReactorInstance;
Expand All @@ -61,7 +60,6 @@
import org.lflang.target.property.ClockSyncOptionsProperty;
import org.lflang.target.property.CoordinationOptionsProperty;
import org.lflang.target.property.CoordinationProperty;
import org.lflang.target.property.DNETProperty;
import org.lflang.target.property.FedSetupProperty;
import org.lflang.target.property.KeepaliveProperty;
import org.lflang.target.property.SingleThreadedProperty;
Expand Down Expand Up @@ -835,22 +833,6 @@ private String generateCodeForPhysicalActions(
outputFound = output;
}
}
if (federate.targetConfig.getOrDefault(DNETProperty.INSTANCE)) {
ActionInstance found = federate.findPhysicalAction(instance);
if (found != null) {
String warning =
String.join(
"\n",
"Found a physical action inside the federate "
+ addDoubleQuotes(instance.getName()),
"and a signal downstream next event tag (DNET) will be used.",
"The signal DNET may increase the lag, the time difference between ",
"the time this physical action is scheduled and the time it is executed, ",
"specifically when this federate has multiple upstream reactors.",
"Consider disabling the signal DNET with a property {DNET: false}.");
messageReporter.at(found.getDefinition()).warning(warning);
}
}
if (minDelay != TimeValue.MAX_VALUE) {
// Unless silenced, issue a warning.
if (coordinationOptions.advanceMessageInterval == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -647,27 +647,6 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
return inFederate;
}

/**
* Return the first found physical action or null if there is no physical action in this federate.
*
* @param instance The reactor instance to check whether there is a physical action.
*/
public ActionInstance findPhysicalAction(ReactorInstance instance) {
for (ActionInstance action : instance.actions) {
if (action.isPhysical()) {
return action;
}
}
for (ReactorInstance child : instance.children) {
for (ActionInstance action : child.actions) {
if (action.isPhysical()) {
return action;
}
}
}
return null;
}

/**
* Find output ports that are connected to a physical action trigger upstream in the same reactor.
* Return a list of such outputs paired with the minimum delay from the nearest physical action.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.lflang.target.property.AuthProperty;
import org.lflang.target.property.ClockSyncModeProperty;
import org.lflang.target.property.ClockSyncOptionsProperty;
import org.lflang.target.property.DNETProperty;
import org.lflang.target.property.TracingProperty;
import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;

Expand Down Expand Up @@ -324,9 +323,6 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
if (targetConfig.getOrDefault(TracingProperty.INSTANCE).isEnabled()) {
commands.add(" -t \\");
}
if (!targetConfig.getOrDefault(DNETProperty.INSTANCE)) {
commands.add(" -d \\");
}
commands.addAll(
List.of(
" -n " + federates.size() + " \\",
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/lflang/target/Target.java
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,6 @@ public void initialize(TargetConfig config) {
CompilerProperty.INSTANCE,
CoordinationOptionsProperty.INSTANCE,
CoordinationProperty.INSTANCE,
DNETProperty.INSTANCE,
DockerProperty.INSTANCE,
FilesProperty.INSTANCE,
KeepaliveProperty.INSTANCE,
Expand Down
27 changes: 0 additions & 27 deletions core/src/main/java/org/lflang/target/property/DNETProperty.java

This file was deleted.

Loading