X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.cc;h=fc2370616388d0c60acf8048fceee307e33ef269;hb=eb6e8431496fc3dfd7638fbfba4229f7215f6308;hp=3c6d0d7588dc2ff33984a94577b34de37bfdac2f;hpb=dd34ddf490dd97c2c202092c8fa44064a07f8c4f;p=model-checker.git

diff --git a/execution.cc b/execution.cc
index 3c6d0d7..fc23706 100644
--- a/execution.cc
+++ b/execution.cc
@@ -66,7 +66,7 @@ ModelExecution::ModelExecution(ModelChecker *m,
 	scheduler(scheduler),
 	action_trace(),
 	thread_map(2), /* We'll always need at least 2 threads */
-	obj_map(new HashTable<const void *, action_list_t *, uintptr_t, 4>()),
+	obj_map(),
 	condvar_waiters_map(),
 	obj_thrd_map(),
 	promises(),
@@ -82,6 +82,7 @@ ModelExecution::ModelExecution(ModelChecker *m,
 	model_thread = new Thread(get_next_id());
 	add_thread(model_thread);
 	scheduler->register_engine(this);
+	node_stack->register_engine(this);
 }
 
 /** @brief Destructor */
@@ -90,8 +91,6 @@ ModelExecution::~ModelExecution()
 	for (unsigned int i = 0; i < get_num_threads(); i++)
 		delete get_thread(int_to_id(i));
 
-	delete obj_map;
-
 	for (unsigned int i = 0; i < promises.size(); i++)
 		delete promises[i];
 
@@ -367,14 +366,17 @@ ModelAction * ModelExecution::get_last_fence_conflict(ModelAction *act) const
 ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 {
 	switch (act->get_type()) {
-	/* case ATOMIC_FENCE: fences don't directly cause backtracking */
+	case ATOMIC_FENCE:
+		/* Only seq-cst fences can (directly) cause backtracking */
+		if (!act->is_seqcst())
+			break;
 	case ATOMIC_READ:
 	case ATOMIC_WRITE:
 	case ATOMIC_RMW: {
 		ModelAction *ret = NULL;
 
 		/* linear search: from most recent to oldest */
-		action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+		action_list_t *list = obj_map.get(act->get_location());
 		action_list_t::reverse_iterator rit;
 		for (rit = list->rbegin(); rit != list->rend(); rit++) {
 			ModelAction *prev = *rit;
@@ -396,7 +398,7 @@ ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 	case ATOMIC_LOCK:
 	case ATOMIC_TRYLOCK: {
 		/* linear search: from most recent to oldest */
-		action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+		action_list_t *list = obj_map.get(act->get_location());
 		action_list_t::reverse_iterator rit;
 		for (rit = list->rbegin(); rit != list->rend(); rit++) {
 			ModelAction *prev = *rit;
@@ -407,7 +409,7 @@ ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 	}
 	case ATOMIC_UNLOCK: {
 		/* linear search: from most recent to oldest */
-		action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+		action_list_t *list = obj_map.get(act->get_location());
 		action_list_t::reverse_iterator rit;
 		for (rit = list->rbegin(); rit != list->rend(); rit++) {
 			ModelAction *prev = *rit;
@@ -418,7 +420,7 @@ ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 	}
 	case ATOMIC_WAIT: {
 		/* linear search: from most recent to oldest */
-		action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+		action_list_t *list = obj_map.get(act->get_location());
 		action_list_t::reverse_iterator rit;
 		for (rit = list->rbegin(); rit != list->rend(); rit++) {
 			ModelAction *prev = *rit;
@@ -433,7 +435,7 @@ ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 	case ATOMIC_NOTIFY_ALL:
 	case ATOMIC_NOTIFY_ONE: {
 		/* linear search: from most recent to oldest */
-		action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+		action_list_t *list = obj_map.get(act->get_location());
 		action_list_t::reverse_iterator rit;
 		for (rit = list->rbegin(); rit != list->rend(); rit++) {
 			ModelAction *prev = *rit;
@@ -1210,7 +1212,7 @@ bool ModelExecution::check_action_enabled(ModelAction *curr) {
  *
  * @param curr The current action to process
  * @return The ModelAction that is actually executed; may be different than
- * curr; may be NULL, if the current action is not enabled to run
+ * curr
  */
 ModelAction * ModelExecution::check_current_action(ModelAction *curr)
 {
@@ -2112,7 +2114,7 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
 	int tid = id_to_int(act->get_tid());
 	ModelAction *uninit = NULL;
 	int uninit_id = -1;
-	action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+	action_list_t *list = get_safe_ptr_action(&obj_map, act->get_location());
 	if (list->empty() && act->is_atomic_var()) {
 		uninit = get_uninitialized_action(act);
 		uninit_id = id_to_int(uninit->get_tid());
@@ -2145,7 +2147,7 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
 
 	if (act->is_wait()) {
 		void *mutex_loc = (void *) act->get_value();
-		get_safe_ptr_action(obj_map, mutex_loc)->push_back(act);
+		get_safe_ptr_action(&obj_map, mutex_loc)->push_back(act);
 
 		SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, mutex_loc);
 		if (tid >= (int)vec->size())
@@ -2193,7 +2195,7 @@ ModelAction * ModelExecution::get_last_fence_release(thread_id_t tid) const
 ModelAction * ModelExecution::get_last_seq_cst_write(ModelAction *curr) const
 {
 	void *location = curr->get_location();
-	action_list_t *list = get_safe_ptr_action(obj_map, location);
+	action_list_t *list = obj_map.get(location);
 	/* Find: max({i in dom(S) | seq_cst(t_i) && isWrite(t_i) && samevar(t_i, t)}) */
 	action_list_t::reverse_iterator rit;
 	for (rit = list->rbegin(); (*rit) != curr; rit++)
@@ -2216,7 +2218,11 @@ ModelAction * ModelExecution::get_last_seq_cst_write(ModelAction *curr) const
 ModelAction * ModelExecution::get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const
 {
 	/* All fences should have location FENCE_LOCATION */
-	action_list_t *list = get_safe_ptr_action(obj_map, FENCE_LOCATION);
+	action_list_t *list = obj_map.get(FENCE_LOCATION);
+
+	if (!list)
+		return NULL;
+
 	action_list_t::reverse_iterator rit = list->rbegin();
 
 	if (before_fence) {
@@ -2245,7 +2251,7 @@ ModelAction * ModelExecution::get_last_seq_cst_fence(thread_id_t tid, const Mode
 ModelAction * ModelExecution::get_last_unlock(ModelAction *curr) const
 {
 	void *location = curr->get_location();
-	action_list_t *list = get_safe_ptr_action(obj_map, location);
+	action_list_t *list = obj_map.get(location);
 	/* Find: max({i in dom(S) | isUnlock(t_i) && samevar(t_i, t)}) */
 	action_list_t::reverse_iterator rit;
 	for (rit = list->rbegin(); rit != list->rend(); rit++)