Get enclaves refactoring working with minimal changes to lingua-franca

core/federated/RTI/rti_common.c

@@ -10,6 +10,8 @@
 #if defined STANDALONE_RTI || defined LF_ENCLAVES
 #include "rti_common.h"
 
+extern lf_mutex_t rti_mutex;
+
 /**
  * Local reference to rti_common_t instance.
  */
@@ -52,7 +54,7 @@ void initialize_scheduling_node(scheduling_node_t* e, uint16_t id) {
 void _logical_tag_complete(scheduling_node_t* enclave, tag_t completed) {
     // FIXME: Consolidate this message with NET to get NMR (Next Message Request).
     // Careful with handling startup and shutdown.
-    lf_mutex_lock(rti_common->mutex);
+    lf_mutex_lock(&rti_mutex);
 
     enclave->completed = completed;
 
@@ -70,7 +72,7 @@ void _logical_tag_complete(scheduling_node_t* enclave, tag_t completed) {
         free(visited);
     }
 
-    lf_mutex_unlock(rti_common->mutex);
+    lf_mutex_unlock(&rti_mutex);
 }
 
 tag_advance_grant_t tag_advance_grant_if_safe(scheduling_node_t* e) {
@@ -115,6 +117,7 @@ tag_advance_grant_t tag_advance_grant_if_safe(scheduling_node_t* e) {
     // To handle cycles, need to create a boolean array to keep
     // track of which upstream enclave have been visited.
     bool *visited = (bool *)calloc(rti_common->number_of_scheduling_nodes, sizeof(bool)); // Initializes to 0.
+    visited[e->id] = true;
 
     // Find the tag of the earliest possible incoming message from
     // upstream enclaves.

core/federated/RTI/rti_remote.c

@@ -261,6 +261,7 @@ void notify_provisional_tag_advance_grant(scheduling_node_t* e, tag_t tag) {
             // To handle cycles, need to create a boolean array to keep
             // track of which upstream federates have been visited.
             bool* visited = (bool*)calloc(rti_remote->base.number_of_scheduling_nodes, sizeof(bool)); // Initializes to 0.
+            visited[upstream->enclave.id] = true;
 
             // Find the (transitive) next event tag upstream.
             tag_t upstream_next_event = transitive_next_event(

core/federated/RTI/rti_remote.h

@@ -506,7 +506,7 @@ int process_args(int argc, const char* argv[]);
 /**
  * Initialize the _RTI instance.
  */
-void initialize_RTI();
+void initialize_RTI(rti_remote_t *rti);
 
 #endif // RTI_REMOTE_H
 #endif // STANDALONE_RTI

lingua-franca-ref.txt

@@ -1 +1 @@
-enclaves2
+enclaves3