Removed chainID

lf-lang · May 29, 2024 · 24a6b20 · 24a6b20
1 parent 9c725a3
commit 24a6b20
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -173,15 +173,6 @@ public ReactionInstance(Reaction definition, ReactorInstance parent, int index)
   //////////////////////////////////////////////////////
   //// Public fields.
 
-  /**
-   * Indicates the chain this reaction is a part of. It is constructed through a bit-wise or among
-   * all upstream chains. Each fork in the dependency graph setting a new, unused bit to true in
-   * order to disambiguate it from parallel chains. Note that zero results in no overlap with any
-   * other reaction, which means the reaction can execute in parallel with any other reaction. The
-   * default is 1L. If left at the default, parallel execution will be based purely on levels.
-   */
-  public long chainID = 1L;
-
   /** The ports or actions that this reaction may write to. */
   public Set<TriggerInstance<? extends Variable>> effects = new LinkedHashSet<>();
 

diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -897,7 +897,6 @@ public static void generateReactionAndTriggerStructs(
       // Set the defaults of the reaction_t struct in the constructor.
       // Since the self struct is allocated using calloc, there is no need to set:
       // self->_lf__reaction_"+reactionCount+".index = 0;
-      // self->_lf__reaction_"+reactionCount+".chain_id = 0;
       // self->_lf__reaction_"+reactionCount+".pos = 0;
       // self->_lf__reaction_"+reactionCount+".status = inactive;
       // self->_lf__reaction_"+reactionCount+".deadline = 0LL;

diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -240,7 +240,6 @@ private static boolean setReactionPriorities(ReactorInstance reactor, CodeBuilde
         temp.pr(
             String.join(
                 "\n",
-                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
                 "// index is the OR of level " + level + " and ",
                 "// deadline " + inferredDeadline.toNanoSeconds() + " shifted left 16 bits.",
                 CUtil.reactionRef(r) + ".index = " + reactionIndex + ";"));
@@ -249,7 +248,6 @@ private static boolean setReactionPriorities(ReactorInstance reactor, CodeBuilde
         temp.pr(
             String.join(
                 "\n",
-                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
                 "// index is the OR of levels[" + runtimeIdx + "] and ",
                 "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
                 CUtil.reactionRef(r)
@@ -266,7 +264,6 @@ private static boolean setReactionPriorities(ReactorInstance reactor, CodeBuilde
         temp.pr(
             String.join(
                 "\n",
-                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
                 "// index is the OR of levels[" + runtimeIdx + "] and ",
                 "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
                 CUtil.reactionRef(r)
@@ -283,7 +280,6 @@ private static boolean setReactionPriorities(ReactorInstance reactor, CodeBuilde
         temp.pr(
             String.join(
                 "\n",
-                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
                 "// index is the OR of levels[" + runtimeIdx + "] and ",
                 "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
                 CUtil.reactionRef(r)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
+5 −26		core/environment.c
+2 −3		core/federated/federate.c
+36 −34		core/threaded/reactor_threaded.c
+66 −35		core/threaded/scheduler_GEDF_NP.c
+28 −19		core/threaded/scheduler_NP.c
+9 −5		core/threaded/scheduler_adaptive.c
+11 −1		core/threaded/scheduler_instance.c
+4 −4		core/threaded/scheduler_sync_tag_advance.c
+1 −1		core/utils/pqueue.c
+5 −25		include/core/environment.h
+1 −3		include/core/lf_types.h
+3 −14		include/core/threaded/reactor_threaded.h
+5 −37		include/core/threaded/scheduler.h
+7 −38		include/core/threaded/scheduler_instance.h
+4 −4		include/core/threaded/scheduler_sync_tag_advance.h
+3 −0		low_level_platform/api/CMakeLists.txt
+12 −0		low_level_platform/api/platform/lf_rp2040_support.h
+6 −0		low_level_platform/impl/CMakeLists.txt
+0 −5		low_level_platform/impl/src/lf_linux_support.c
+116 −8		low_level_platform/impl/src/lf_rp2040_support.c
+3 −1		low_level_platform/impl/src/lf_zephyr_support.c