model/schedule: comput "reduadant" measurement, print along with traces

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index e87490313cf4836e1f11dab9528ef7ad00b6bf26..a2eb4cf7254834fecac49905838d53b647b95de5 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -96,6 +96,23 @@ bool Scheduler::is_sleep_set(const Thread *t) const
        return get_enabled(t) == THREAD_SLEEP_SET;
 }
 
+/**
+ * @brief Check if execution is stuck with no enabled threads and some sleeping
+ * thread
+ * @return True if no threads are enabled an some thread is in the sleep set;
+ * false otherwise
+ */
+bool Scheduler::all_threads_sleeping() const
+{
+       bool sleeping = false;
+       for (int i = 0; i < enabled_len; i++)
+               if (enabled[i] == THREAD_ENABLED)
+                       return false;
+               else if (enabled[i] == THREAD_SLEEP_SET)
+                       sleeping = true;
+       return sleeping;
+}
+
 enabled_type_t Scheduler::get_enabled(const Thread *t) const
 {
        int id = id_to_int(t->get_id());
@@ -207,6 +224,10 @@ Thread * Scheduler::select_next_thread()
        return NULL;
 }
 
+void Scheduler::set_scheduler_thread(thread_id_t tid) {
+       curr_thread_index=id_to_int(tid);
+}
+
 /**
  * @brief Set the current "running" Thread
  * @param t Thread to run
@@ -215,8 +236,6 @@ void Scheduler::set_current_thread(Thread *t)
 {
        ASSERT(t && !t->is_model_thread());
 
-       curr_thread_index = id_to_int(t->get_id());
-
        current = t;
        if (DBG_ENABLED())
                print();