Expose after delays to runtime.

lf-lang · Sep 30, 2023 · ff3ddb8 · ff3ddb8
1 parent e2c7fd9
commit ff3ddb8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -547,11 +547,12 @@ protected String makePreamble(
     int numOfNetworkActions = federate.networkMessageActions.size();
     code.pr(
         """
-        lf_action_base_t* _lf_action_table[%1$s];
-        size_t _lf_action_table_size = %1$s;
-        lf_action_base_t* _lf_zero_delay_action_table[%2$s];
-        size_t _lf_zero_delay_action_table_size = %2$s;
-        """
+            interval_t _lf_action_delay_table[%1$s];
+            lf_action_base_t* _lf_action_table[%1$s];
+            size_t _lf_action_table_size = %1$s;
+            lf_action_base_t* _lf_zero_delay_action_table[%2$s];
+            size_t _lf_zero_delay_action_table_size = %2$s;
+            """
             .formatted(numOfNetworkActions, federate.zeroDelayNetworkMessageActions.size()));
 
     int numOfNetworkReactions = federate.networkReceiverReactions.size();

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -53,6 +53,10 @@ public static String initializeTriggersForNetworkActions(
         var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
         var actionInstance = reactor.lookupActionInstance(action);
         var trigger = CUtil.actionRef(actionInstance, null);
+        var delay = federate.networkMessageActionDelays.get(i);
+        code.pr(
+            "_lf_action_delay_table[" + actionTableCount + "] = " + getNetworkDelayLiteral(delay) + "; \\"
+        );
         code.pr(
             "_lf_action_table["
                 + (actionTableCount++)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -273,6 +273,7 @@ private static void addNetworkReceiverReactor(
 
     // Keep track of this action in the destination federate.
     connection.dstFederate.networkMessageActions.add(networkAction);
+    connection.dstFederate.networkMessageActionDelays.add(connection.getDefinition().getDelay());
     if (connection.getDefinition().getDelay() == null)
       connection.dstFederate.zeroDelayNetworkMessageActions.add(networkAction);
 

diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -170,6 +170,8 @@ public Instantiation getInstantiation() {
    */
   public List<Action> networkMessageActions = new ArrayList<>();
 
+  public List<Expression> networkMessageActionDelays = new ArrayList<>();
+
   /**
    * List of networkMessage actions corresponding to zero-delay connections. This should be a subset
    * of the networkMessageActions.