remove another field

diff --git a/action.cc b/action.cc
index 685db1052d0706731bdaba791f06cf6dc975a1b0..b9f3d07d134682bcbb3a6314e4f776c3ce178ac6 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -42,8 +42,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        last_fence_release(NULL),
        node(NULL),
        seq_number(ACTION_INITIAL_CLOCK),
-       cv(NULL),
-       sleep_flag(false)
+       cv(NULL)
 {
        /* References to NULL atomic variables can end up here */
        ASSERT(loc || type == ATOMIC_FENCE);

diff --git a/action.h b/action.h
index 2f599e969baab97dda56989ce0ee559d343d7780..fead25e649a3dfcb575e9d5aae353b4363e92d8c 100644 (file)
--- a/action.h
+++ b/action.h
@@ -175,8 +175,6 @@ public:
        void process_rmw(ModelAction * act);
        void copy_typeandorder(ModelAction * act);
 
-       void set_sleep_flag() { sleep_flag=true; }
-       bool get_sleep_flag() { return sleep_flag; }
        unsigned int hash() const;
 
        bool equals(const ModelAction *x) const { return this == x; }
@@ -245,8 +243,6 @@ private:
         * vectors for all operations.
         */
        ClockVector *cv;
-
-       bool sleep_flag;
 };
 
 #endif /* __ACTION_H__ */

diff --git a/model.cc b/model.cc
index e9f34da5afb6efee11813ace8ba17d099e8d1c58..9bf9764184c553bdda9a83e983734cf04325b3d6 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -103,22 +103,6 @@ Thread * ModelChecker::get_next_thread()
        return scheduler->select_next_thread(node_stack->get_head());
 }
 
-/**
- * We need to know what the next actions of all threads in the sleep
- * set will be.  This method computes them and stores the actions at
- * the corresponding thread object's pending action.
- */
-void ModelChecker::execute_sleep_set()
-{
-       for (unsigned int i = 0; i < get_num_threads(); i++) {
-               thread_id_t tid = int_to_id(i);
-               Thread *thr = get_thread(tid);
-               if (scheduler->is_sleep_set(thr) && thr->get_pending()) {
-                       thr->get_pending()->set_sleep_flag();
-               }
-       }
-}
-
 /**
  * @brief Assert a bug in the executing program.
  *

diff --git a/model.h b/model.h
index 18fcf0beb0f10edff52f5921bafa9234c447b3d1..9f7804d838bd079323ace1923df7254241c90590 100644 (file)
--- a/model.h
+++ b/model.h
@@ -92,8 +92,6 @@ private:
 
        unsigned int get_num_threads() const;
 
-       void execute_sleep_set();
-
        bool next_execution();
        bool should_terminate_execution();