fix conflicts

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

Conflicts:
	schedule.cc

diff --combined model.cc
index 24eb83dbbc6515cb4c24730e27ee94c4c949afbe,ae3788945c7756881178b1657bb215cf5a71901a..cec59d52a5579ba651ec2f97cacd689d87da34fe
--- 1/model.cc
--- 2/model.cc
+++ b/model.cc
@@@ -282,8 -282,6 +282,6 @@@ Thread * ModelChecker::get_next_thread(
                                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();
  
@@@ -1113,7 -1111,7 +1111,7 @@@ bool ModelChecker::process_thread_actio
        case THREAD_CREATE: {
                thrd_t *thrd = (thrd_t *)curr->get_location();
                struct thread_params *params = (struct thread_params *)curr->get_value();
 -              Thread *th = new Thread(thrd, params->func, params->arg);
 +              Thread *th = new Thread(thrd, params->func, params->arg, get_thread(curr));
                add_thread(th);
                th->set_creation(curr);
                /* Promises can be satisfied by children */

diff --combined schedule.cc
index 1bd1b0f983fef2a602fe6b089db723c4526adc4a,e87490313cf4836e1f11dab9528ef7ad00b6bf26..8dd13304093008094c00d465ffb4086eec1e810d
--- 1/schedule.cc
--- 2/schedule.cc
+++ b/schedule.cc
@@@ -207,10 -207,6 +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
@@@ -219,7 -215,7 +215,7 @@@ void Scheduler::set_current_thread(Thre
  {
        ASSERT(t && !t->is_model_thread());
  
 -      curr_thread_index = id_to_int(t->get_id());
 +      //curr_thread_index = id_to_int(t->get_id());
  
        current = t;
        if (DBG_ENABLED())