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.

Sign up for GitHub

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

Draft: Introduce the next downstream tag (NDT) to optimize the communication in centralized federated execution #2114

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Draft: Introduce the next downstream tag (NDT) to optimize the communication in centralized federated execution #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a69f432
First commit to add the NDT property
byeonggiljun Nov 20, 2023
5a44ace
Update reactor-c
byeonggiljun Nov 20, 2023
2e343d9
Add a line to build a docker image for the RTI
byeonggiljun Nov 20, 2023
9ba1f0d
Change the local rti image name
byeonggiljun Nov 21, 2023
dffe725
Merge branch 'master' into rti-ndt
byeonggiljun Nov 21, 2023
27a8d65
Make NDTProperty extends BooleanProperty
byeonggiljun Nov 21, 2023
d692c6e
Add a code for turning on the ndt option of the RTI
byeonggiljun Nov 28, 2023
102c3ab
Merge branch 'master' into rti-NET
byeonggiljun Dec 4, 2023
e47000c
Update reactor-c
byeonggiljun Dec 4, 2023
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/actions/install-rti/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash
cd core/src/main/resources/lib/c/reactor-c/core/federated/RTI
docker build -t lflang/rti:rti -f rti.Dockerfile ../../../core/
mkdir build
cd build
if [[ "$OSTYPE" == "darwin"* ]]; then
export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"
fi
cmake -DAUTH=ON ../
make
sudo make install
sudo make install
4 changes: 4 additions & 0 deletions core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.lflang.target.property.AuthProperty;
import org.lflang.target.property.ClockSyncModeProperty;
import org.lflang.target.property.ClockSyncOptionsProperty;
import org.lflang.target.property.NDTProperty;
import org.lflang.target.property.TracingProperty;
import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;

Expand Down Expand Up @@ -339,6 +340,9 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
if (targetConfig.getOrDefault(AuthProperty.INSTANCE)) {
commands.add(" -a \\");
}
if (targetConfig.getOrDefault(NDTProperty.INSTANCE)) {
commands.add(" --ndt \\");
}
if (targetConfig.getOrDefault(TracingProperty.INSTANCE).isEnabled()) {
commands.add(" -t \\");
}
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/org/lflang/target/Target.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.lflang.target.property.ExternalRuntimePathProperty;
import org.lflang.target.property.FilesProperty;
import org.lflang.target.property.KeepaliveProperty;
import org.lflang.target.property.NDTProperty;
import org.lflang.target.property.NoRuntimeValidationProperty;
import org.lflang.target.property.NoSourceMappingProperty;
import org.lflang.target.property.PlatformProperty;
Expand Down Expand Up @@ -599,6 +600,7 @@ public void initialize(TargetConfig config) {
DockerProperty.INSTANCE,
FilesProperty.INSTANCE,
KeepaliveProperty.INSTANCE,
NDTProperty.INSTANCE,
NoSourceMappingProperty.INSTANCE,
PlatformProperty.INSTANCE,
ProtobufsProperty.INSTANCE,
Expand Down Expand Up @@ -633,6 +635,7 @@ public void initialize(TargetConfig config) {
DockerProperty.INSTANCE,
FilesProperty.INSTANCE,
KeepaliveProperty.INSTANCE,
NDTProperty.INSTANCE,
NoSourceMappingProperty.INSTANCE,
ProtobufsProperty.INSTANCE,
SchedulerProperty.INSTANCE,
Expand Down
25 changes: 25 additions & 0 deletions core/src/main/java/org/lflang/target/property/NDTProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.lflang.target.property;

/**
* If true, the RTI will send NDT messages to federates to reduce the number of messages.
* The default is false.
*/
public final class NDTProperty extends BooleanProperty {

/** Singleton target property instance. */
public static final NDTProperty INSTANCE = new NDTProperty();

private NDTProperty() {
super();
}

@Override
public Boolean initialValue() {
return true;
}

@Override
public String name() {
return "ndt";
}
}
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Open in desktop
Submodule reactor-c updated 36 files
+9 −1 core/environment.c
+2 −0 core/federated/RTI/CMakeLists.txt
+11 −3 core/federated/RTI/main.c
+211 −109 core/federated/RTI/rti_common.c
+63 −25 core/federated/RTI/rti_common.h
+11 −1 core/federated/RTI/rti_local.c
+7 −2 core/federated/RTI/rti_local.h
+297 −132 core/federated/RTI/rti_remote.c
+54 −6 core/federated/RTI/rti_remote.h
+140 −13 core/federated/federate.c
+1 −1 core/platform/lf_arduino_support.c
+5 −0 core/reactor.c
+12 −1 core/reactor_common.c
+13 −13 core/tag.c
+5 −1 core/threaded/reactor_threaded.c
+5 −1 core/trace.c
+1 −1 core/utils/CMakeLists.txt
+26 −434 core/utils/pqueue.c
+361 −0 core/utils/pqueue_base.c
+155 −0 core/utils/pqueue_tag.c
+28 −79 core/utils/util.c
+3 −5 docs/README.md
+12 −0 include/core/environment.h
+1 −1 include/core/federated/federate.h
+22 −0 include/core/federated/network/net_common.h
+0 −9 include/core/reactor.h
+9 −0 include/core/tag.h
+6 −0 include/core/trace.h
+63 −184 include/core/utils/pqueue.h
+215 −0 include/core/utils/pqueue_base.h
+154 −0 include/core/utils/pqueue_tag.h
+9 −18 include/core/utils/util.h
+1 −1 lingua-franca-ref.txt
+104 −0 test/general/utils/pqueue_test.c
+14 −0 test/src_gen_stub.c
+3 −0 util/tracing/visualization/fedsd.py