Move check_deadline to reactor.c, as it needs to know struct types, s…

…uch as reaction_t and self_base_t which, which are defined in reactor.h.

Thus, if we put check_deadline inside util.c, it creates mutual dependency between util and reactor.

core/reactor.c

@@ -322,6 +322,24 @@ void request_stop() {
 	_lf_set_stop_tag(new_stop_tag);
 }
 
+/**
+ * Check the deadline of the currently executing reaction against the
+ * current physical time. If the deadline has passed, invoke the deadline
+ * handler and return true. Otherwise, return false.
+ * 
+ * @param self The self struct of the reactor.
+ * @return true if the specified deadline has passed.
+ * @return false if the deadline has not passed yet.
+ */
+bool check_deadline(void* self) {
+	reaction_t* reaction = ((self_base_t*)self)->executing_reaction;
+	if (get_physical_time() > get_logical_time() + reaction->deadline) {
+		reaction->deadline_violation_handler(self);
+		return true;
+	}
+	return false;
+}
+
 /**
  * Do nothing. This implementation is not multithreaded.
  */

core/util.c

@@ -32,7 +32,6 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "util.h"
-#include "reactor.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -218,21 +217,3 @@ void register_print_function(print_message_function_t* function, int log_level)
     print_message_function = function;
     print_message_level = log_level;
 }
-
-/**
- * Check the deadline of the currently executing reaction against the
- * current physical time. If the deadline has passed, invoke the deadline
- * handler and return true. Otherwise, return false.
- * 
- * @param self The self struct of the reactor.
- * @return true if the specified deadline has passed.
- * @return false if the deadline has not passed yet.
- */
-bool check_deadline(void* self) {
-	reaction_t* reaction = ((self_base_t*)self)->executing_reaction;
-	if (get_physical_time() > get_logical_time() + reaction->deadline) {
-		reaction->deadline_violation_handler(self);
-		return true;
-	}
-	return false;
-}

core/util.h

@@ -34,7 +34,6 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define UTIL_H
 
 #include <stdarg.h>   // Defines va_list
-#include <stdbool.h>  // Defines bool
 
 /**
  * Holds generic statistical data
@@ -212,15 +211,4 @@ typedef void(print_message_function_t)(char*, va_list);
  */
 void register_print_function(print_message_function_t* function, int log_level);
 
-/**
- * Check the deadline of the currently executing reaction against the
- * current physical time. If the deadline has passed, invoke the deadline
- * handler and return true. Otherwise, return false.
- * 
- * @param self The self struct of the reactor.
- * @return true if the specified deadline has passed.
- * @return false if the deadline has not passed yet.
- */
-bool check_deadline(void* self);
-
 #endif /* UTIL_H */