From 37add7f58b9494dff8f16ef8eb858194d46d1b37 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 5 Jun 2013 16:31:41 -0700 Subject: [PATCH] model: remove redundant code (is_enabled) These members should just stay implemented in execution.{cc,h}, not model.{cc,h}. --- model.cc | 22 +--------------------- model.h | 3 --- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/model.cc b/model.cc index 16d5db4..5625f30 100644 --- a/model.cc +++ b/model.cc @@ -350,26 +350,6 @@ Thread * ModelChecker::get_thread(const ModelAction *act) const return execution->get_thread(act); } -/** - * @brief Check if a Thread is currently enabled - * @param t The Thread to check - * @return True if the Thread is currently enabled - */ -bool ModelChecker::is_enabled(Thread *t) const -{ - return scheduler->is_enabled(t); -} - -/** - * @brief Check if a Thread is currently enabled - * @param tid The ID of the Thread to check - * @return True if the Thread is currently enabled - */ -bool ModelChecker::is_enabled(thread_id_t tid) const -{ - return scheduler->is_enabled(tid); -} - /** * Switch from a model-checker context to a user-thread context. This is the * complement of ModelChecker::switch_to_master and must be called from the @@ -458,7 +438,7 @@ void ModelChecker::run() for (unsigned int i = 0; i < get_num_threads(); i++) { Thread *th = get_thread(int_to_id(i)); ModelAction *act = th->get_pending(); - if (act && is_enabled(th) && !execution->check_action_enabled(act)) { + if (act && execution->is_enabled(th) && !execution->check_action_enabled(act)) { scheduler->sleep(th); } } diff --git a/model.h b/model.h index 25e20b1..74cb4e1 100644 --- a/model.h +++ b/model.h @@ -57,9 +57,6 @@ public: Thread * get_thread(thread_id_t tid) const; Thread * get_thread(const ModelAction *act) const; - bool is_enabled(Thread *t) const; - bool is_enabled(thread_id_t tid) const; - Thread * get_current_thread() const; void switch_from_master(Thread *thread); -- 2.34.1