Merge pull request #547 from lf-lang/maxwait

Improve support for maxwait and tweak scheduling of physical actions

Author: edwardalee

core/reactor_common.c

@@ -190,9 +190,13 @@ interval_t lf_get_stp_offset() { return lf_fed_STA_offset; }
 
 interval_t lf_get_sta() { return lf_fed_STA_offset; }
 
+interval_t lf_get_fed_maxwait() { return lf_fed_STA_offset; }
+
 void lf_set_stp_offset(interval_t offset) { lf_set_sta(offset); }
 
-void lf_set_sta(interval_t offset) { lf_fed_STA_offset = offset; }
+void lf_set_sta(interval_t offset) { lf_set_fed_maxwait(offset); }
+
+void lf_set_fed_maxwait(interval_t offset) { lf_fed_STA_offset = offset; }
 
 #endif // FEDERATED_DECENTRALIZED
 

include/core/reactor.h

@@ -62,31 +62,45 @@ void lf_set_stop_tag(environment_t* env, tag_t tag);
 
 /**
  * @brief Return the global STP offset on advancement of logical time for federated execution.
- * @deprecated Use lf_get_sta() instead.
+ * @deprecated Use lf_get_fed_maxwait() instead.
  */
 interval_t lf_get_stp_offset(void);
 
 /**
  * @brief Return the global STA (safe to advance) offset for federated execution.
  * @ingroup Federated
+ * @deprecated Use lf_get_fed_maxwait() instead.
  */
 interval_t lf_get_sta(void);
 
+/**
+ * @brief Return the global maxwait for the current federate.
+ * @ingroup Federated
+ */
+interval_t lf_get_fed_maxwait(void);
+
 /**
  * @brief Set the global STP offset on advancement of logical time for federated execution.
  * @param offset A non-negative time value to be applied as the STP offset.
- * @deprecated Use lf_set_sta() instead.
+ * @deprecated Use lf_set_fed_maxwait() instead.
  */
 void lf_set_stp_offset(interval_t offset);
 
 /**
  * @brief Set the global STA (safe to advance) offset for federated execution.
  * @ingroup Federated
- *
  * @param offset A non-negative time value to be applied as the STA offset.
+ * @deprecated Use lf_set_fed_maxwait() instead.
  */
 void lf_set_sta(interval_t offset);
 
+/**
+ * @brief Set the global maxwait for the current federate.
+ * @ingroup Federated
+ * @param offset A non-negative time value to be applied as the maxwait.
+ */
+void lf_set_fed_maxwait(interval_t offset);
+
 #endif // FEDERATED_DECENTRALIZED
 
 /**

lib/schedule.c

@@ -160,6 +160,10 @@ trigger_handle_t lf_schedule_trigger(environment_t* env, trigger_t* trigger, int
   if (trigger->is_physical) {
     // Get the current physical time and assign it as the intended time.
     intended_tag.time = lf_time_physical() + delay;
+    if (intended_tag.time < env->start_tag.time) {
+      // A physical action should never be assigned a time earlier than the start time.
+      intended_tag.time = env->start_tag.time;
+    }
     intended_tag.microstep = 0;
   } else {
 // FIXME: We need to verify that we are executing within a reaction?