From: Brian Demsky <bdemsky@uci.edu>
Date: Mon, 25 Feb 2013 07:25:59 +0000 (-0800)
Subject: fix conflicts
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=dc9c89654982c64264dfee7b1ea23e9a5e88e18e;hp=-c

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

Conflicts:
	schedule.cc
---

dc9c89654982c64264dfee7b1ea23e9a5e88e18e
diff --combined model.cc
index 24eb83db,ae378894..cec59d52
--- a/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 1bd1b0f9,e8749031..8dd13304
--- a/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())