X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=a5b06ddc3358e0b82f2f353333cad576981379a2;hb=2ca6ef09383bf8845c18bb478396da3a260da08f;hp=715a2584f36a1538528489d60f987142ad0f2a77;hpb=9bdbedb24f7c16c4941ec6b711fc8065e0cee9d3;p=model-checker.git

diff --git a/model.cc b/model.cc
index 715a258..a5b06dd 100644
--- a/model.cc
+++ b/model.cc
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <algorithm>
 #include <mutex>
+#include <new>
 
 #include "model.h"
 #include "action.h"
@@ -286,8 +287,7 @@ void ModelChecker::execute_sleep_set() {
 	for(unsigned int i=0;i<get_num_threads();i++) {
 		thread_id_t tid=int_to_id(i);
 		Thread *thr=get_thread(tid);
-		if ( scheduler->get_enabled(thr) == THREAD_SLEEP_SET &&
-				 thr->get_pending() == NULL ) {
+		if (scheduler->is_sleep_set(thr) && thr->get_pending() == NULL) {
 			thr->set_state(THREAD_RUNNING);
 			scheduler->next_thread(thr);
 			Thread::swap(&system_context, thr);
@@ -298,16 +298,15 @@ void ModelChecker::execute_sleep_set() {
 	priv->current_action = NULL;
 }
 
-void ModelChecker::wake_up_sleeping_actions(ModelAction * curr) {
-	for(unsigned int i=0;i<get_num_threads();i++) {
-		thread_id_t tid=int_to_id(i);
-		Thread *thr=get_thread(tid);
-		if ( scheduler->get_enabled(thr) == THREAD_SLEEP_SET ) {
-			ModelAction *pending_act=thr->get_pending();
-			if ((!curr->is_rmwr())&&pending_act->could_synchronize_with(curr)) {
+void ModelChecker::wake_up_sleeping_actions(ModelAction *curr)
+{
+	for (unsigned int i = 0; i < get_num_threads(); i++) {
+		Thread *thr = get_thread(int_to_id(i));
+		if (scheduler->is_sleep_set(thr)) {
+			ModelAction *pending_act = thr->get_pending();
+			if ((!curr->is_rmwr()) && pending_act->could_synchronize_with(curr))
 				//Remove this thread from sleep set
 				scheduler->remove_sleep(thr);
-			}
 		}
 	}
 }
@@ -714,7 +713,7 @@ bool ModelChecker::process_read(ModelAction *curr, bool second_part_of_rmw)
 			/* Read from future value */
 			value = curr->get_node()->get_future_value();
 			modelclock_t expiration = curr->get_node()->get_future_value_expiration();
-			read_from(curr, NULL);
+			curr->set_read_from(NULL);
 			Promise *valuepromise = new Promise(curr, value, expiration);
 			promises->push_back(valuepromise);
 		}
@@ -2103,18 +2102,32 @@ bool ModelChecker::resolve_release_sequences(void *location, work_queue_t *work_
 void ModelChecker::add_action_to_lists(ModelAction *act)
 {
 	int tid = id_to_int(act->get_tid());
-	action_trace->push_back(act);
+	ModelAction *uninit = NULL;
+	int uninit_id = -1;
+	action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+	if (list->empty()) {
+		uninit = new_uninitialized_action(act->get_location());
+		uninit_id = id_to_int(uninit->get_tid());
+		list->push_back(uninit);
+	}
+	list->push_back(act);
 
-	get_safe_ptr_action(obj_map, act->get_location())->push_back(act);
+	action_trace->push_back(act);
+	if (uninit)
+		action_trace->push_front(uninit);
 
 	std::vector<action_list_t> *vec = get_safe_ptr_vect_action(obj_thrd_map, act->get_location());
 	if (tid >= (int)vec->size())
 		vec->resize(priv->next_thread_id);
 	(*vec)[tid].push_back(act);
+	if (uninit)
+		(*vec)[uninit_id].push_front(uninit);
 
 	if ((int)thrd_last_action->size() <= tid)
 		thrd_last_action->resize(get_num_threads());
 	(*thrd_last_action)[tid] = act;
+	if (uninit)
+		(*thrd_last_action)[uninit_id] = uninit;
 
 	if (act->is_fence() && act->is_release()) {
 		if ((int)thrd_last_fence_release->size() <= tid)
@@ -2525,6 +2538,19 @@ bool ModelChecker::sleep_can_read_from(ModelAction * curr, const ModelAction *wr
 	}
 }
 
+/**
+ * @brief Create a new action representing an uninitialized atomic
+ * @param location The memory location of the atomic object
+ * @return A pointer to a new ModelAction
+ */
+ModelAction * ModelChecker::new_uninitialized_action(void *location) const
+{
+	ModelAction *act = (ModelAction *)snapshot_malloc(sizeof(class ModelAction));
+	act = new (act) ModelAction(ATOMIC_UNINIT, std::memory_order_relaxed, location, 0, model_thread);
+	act->create_cv(NULL);
+	return act;
+}
+
 static void print_list(action_list_t *list, int exec_num = -1)
 {
 	action_list_t::iterator it;