fix conflicts

Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
	schedule.cc

diff --git a/model.cc b/model.cc
index 24eb83dbbc6515cb4c24730e27ee94c4c949afbe..cec59d52a5579ba651ec2f97cacd689d87da34fe 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -282,8 +282,6 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr)
                                earliest_diverge = prevnode->get_action();
                        }
                }
-               /* Start the round robin scheduler from this thread id */
-               scheduler->set_scheduler_thread(tid);
                /* The correct sleep set is in the parent node. */
                execute_sleep_set();
 

diff --git a/schedule.cc b/schedule.cc
index 1bd1b0f983fef2a602fe6b089db723c4526adc4a..8dd13304093008094c00d465ffb4086eec1e810d 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -207,10 +207,6 @@ 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

diff --git a/schedule.h b/schedule.h
index 6ae2d2b53eeb354d522d9aac187c38cbdd4226b7..121da08db05a3d0d735c4ca34926006b364c85cb 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -39,8 +39,6 @@ public:
        bool is_enabled(const Thread *t) const;
        bool is_enabled(thread_id_t tid) const;
        bool is_sleep_set(const Thread *t) const;
-       void set_scheduler_thread(thread_id_t tid);
-
 
        SNAPSHOTALLOC
 private: