X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=bc17a882c56f38c7bab1a71064f584ca285e6171;hb=73de022597f45a327075153343c13af0bbe9ad0a;hp=1d3e0c4901b19095dda5091ba662d1b92f1a5aeb;hpb=43974636b8a2773c4cd8f6f1a2537e5d52b3145b;p=model-checker.git

diff --git a/model.cc b/model.cc
index 1d3e0c4..bc17a88 100644
--- a/model.cc
+++ b/model.cc
@@ -159,7 +159,7 @@ void ModelChecker::reset_to_initial_state()
 	/* Print all model-checker output before rollback */
 	fflush(model_out);
 
-	snapshotObject->backTrackBeforeStep(0);
+	snapshot_backtrack_before(0);
 }
 
 /** @return a thread ID for a new Thread */
@@ -174,7 +174,12 @@ unsigned int ModelChecker::get_num_threads() const
 	return priv->next_thread_id;
 }
 
-/** @return The currently executing Thread. */
+/**
+ * Must be called from user-thread context (e.g., through the global
+ * thread_current() interface)
+ *
+ * @return The currently executing Thread.
+ */
 Thread * ModelChecker::get_current_thread() const
 {
 	return scheduler->get_current_thread();
@@ -212,9 +217,8 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr)
 		/* Do not split atomic actions. */
 		if (curr->is_rmwr())
 			return thread_current();
-		/* The THREAD_CREATE action points to the created Thread */
 		else if (curr->get_type() == THREAD_CREATE)
-			return (Thread *)curr->get_location();
+			return curr->get_thread_operand();
 	}
 
 	/* Have we completed exploring the preselected path? */
@@ -254,8 +258,9 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr)
 			tid = next->get_tid();
 			node_stack->pop_restofstack(2);
 		} else {
+			ASSERT(prevnode);
 			/* Make a different thread execute for next step */
-			scheduler->add_sleep(thread_map->get(id_to_int(next->get_tid())));
+			scheduler->add_sleep(get_thread(next->get_tid()));
 			tid = prevnode->get_next_backtrack();
 			/* Make sure the backtracked thread isn't sleeping. */
 			node_stack->pop_restofstack(1);
@@ -819,7 +824,7 @@ bool ModelChecker::process_mutex(ModelAction *curr)
 		if (curr->get_node()->get_misc() == 0) {
 			get_safe_ptr_action(condvar_waiters_map, curr->get_location())->push_back(curr);
 			//disable us
-			scheduler->sleep(get_current_thread());
+			scheduler->sleep(get_thread(curr));
 		}
 		break;
 	}
@@ -866,7 +871,7 @@ bool ModelChecker::process_write(ModelAction *curr)
 					pfv.act->get_node()->add_future_value(pfv.writer->get_value(), pfv.writer->get_seq_number() + params.maxfuturedelay))
 				set_latest_backtrack(pfv.act);
 		}
-		futurevalues->resize(0);
+		futurevalues->clear();
 	}
 
 	mo_graph->commitChanges();
@@ -943,12 +948,12 @@ bool ModelChecker::process_thread_action(ModelAction *curr)
 
 	switch (curr->get_type()) {
 	case THREAD_CREATE: {
-		Thread *th = (Thread *)curr->get_location();
+		Thread *th = curr->get_thread_operand();
 		th->set_creation(curr);
 		break;
 	}
 	case THREAD_JOIN: {
-		Thread *blocking = (Thread *)curr->get_location();
+		Thread *blocking = curr->get_thread_operand();
 		ModelAction *act = get_last_action(blocking->get_id());
 		curr->synchronize_with(act);
 		updated = true; /* trigger rel-seq checks */
@@ -1191,11 +1196,10 @@ void ModelChecker::set_current_action(ModelAction *act) {
  * execution when running permutations of previously-observed executions.
  *
  * @param curr The current action to process
- * @return The next Thread that must be executed. May be NULL if ModelChecker
- * makes no choice (e.g., according to replay execution, combining RMW actions,
- * etc.)
+ * @return The ModelAction that is actually executed; may be different than
+ * curr; may be NULL, if the current action is not enabled to run
  */
-Thread * ModelChecker::check_current_action(ModelAction *curr)
+ModelAction * ModelChecker::check_current_action(ModelAction *curr)
 {
 	ASSERT(curr);
 	bool second_part_of_rmw = curr->is_rmwc() || curr->is_rmw();
@@ -1203,13 +1207,17 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 	if (!check_action_enabled(curr)) {
 		/* Make the execution look like we chose to run this action
 		 * much later, when a lock/join can succeed */
-		get_current_thread()->set_pending(curr);
-		scheduler->sleep(get_current_thread());
-		return get_next_thread(NULL);
+		get_thread(curr)->set_pending(curr);
+		scheduler->sleep(get_thread(curr));
+		return NULL;
 	}
 
 	bool newly_explored = initialize_curr_action(&curr);
 
+	DBG();
+	if (DBG_ENABLED())
+		curr->print();
+
 	wake_up_sleeping_actions(curr);
 
 	/* Add the action to lists before any other model-checking tasks */
@@ -1287,7 +1295,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 
 	check_curr_backtracking(curr);
 	set_backtracking(curr);
-	return get_next_thread(curr);
+	return curr;
 }
 
 void ModelChecker::check_curr_backtracking(ModelAction *curr)
@@ -1295,7 +1303,7 @@ void ModelChecker::check_curr_backtracking(ModelAction *curr)
 	Node *currnode = curr->get_node();
 	Node *parnode = currnode->get_parent();
 
-	if (!parnode->backtrack_empty() ||
+	if ((parnode && !parnode->backtrack_empty()) ||
 			 !currnode->misc_empty() ||
 			 !currnode->read_from_empty() ||
 			 !currnode->future_value_empty() ||
@@ -1765,8 +1773,7 @@ bool ModelChecker::w_modification_order(ModelAction *curr)
 				if (thin_air_constraint_may_allow(curr, act)) {
 					if (!is_infeasible() ||
 							(curr->is_rmw() && act->is_rmw() && curr->get_reads_from() == act->get_reads_from() && !is_infeasible_ignoreRMW())) {
-						struct PendingFutureValue pfv = {curr, act};
-						futurevalues->push_back(pfv);
+						futurevalues->push_back(PendingFutureValue(curr, act));
 					}
 				}
 			}
@@ -2503,14 +2510,8 @@ void ModelChecker::build_reads_from_past(ModelAction *curr)
 			else if (curr->get_sleep_flag() && !curr->is_seqcst() && !sleep_can_read_from(curr, act))
 				allow_read = false;
 
-			if (allow_read) {
-				DEBUG("Adding action to may_read_from:\n");
-				if (DBG_ENABLED()) {
-					act->print();
-					curr->print();
-				}
+			if (allow_read)
 				curr->get_node()->add_read_from(act);
-			}
 
 			/* Include at most one act per-thread that "happens before" curr */
 			if (act->happens_before(curr))
@@ -2722,12 +2723,7 @@ bool ModelChecker::take_step(ModelAction *curr)
 	Thread *curr_thrd = get_thread(curr);
 	ASSERT(curr_thrd->get_state() == THREAD_READY);
 
-	Thread *next_thrd = check_current_action(curr);
-
-	if (curr_thrd->is_blocked() || curr_thrd->is_complete())
-		scheduler->remove_thread(curr_thrd);
-
-	next_thrd = scheduler->next_thread(next_thrd);
+	curr = check_current_action(curr);
 
 	/* Infeasible -> don't take any more steps */
 	if (is_infeasible())
@@ -2737,11 +2733,15 @@ bool ModelChecker::take_step(ModelAction *curr)
 		return false;
 	}
 
-	if (params.bound != 0) {
-		if (priv->used_sequence_numbers > params.bound) {
+	if (params.bound != 0)
+		if (priv->used_sequence_numbers > params.bound)
 			return false;
-		}
-	}
+
+	if (curr_thrd->is_blocked() || curr_thrd->is_complete())
+		scheduler->remove_thread(curr_thrd);
+
+	Thread *next_thrd = get_next_thread(curr);
+	next_thrd = scheduler->next_thread(next_thrd);
 
 	DEBUG("(%d, %d)\n", curr_thrd ? id_to_int(curr_thrd->get_id()) : -1,
 			next_thrd ? id_to_int(next_thrd->get_id()) : -1);