X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=d65695446486e58a929196335660d8c3172cb94d;hb=9ecf77b2763e447363738b6453042982f787a184;hp=ee980b875988b362a2f6c3402be8dc5e795b69d7;hpb=dad0ccf535e5479ec5663e4665528e901a99843a;p=c11tester.git

diff --git a/action.cc b/action.cc
index ee980b87..d6569544 100644
--- a/action.cc
+++ b/action.cc
@@ -41,11 +41,8 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	trace_ref(NULL),
 	thrdmap_ref(NULL),
 	action_ref(NULL),
-	func_ref_count(0),
 	value(value),
 	type(type),
-	original_type(ATOMIC_NOP),
-	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -78,11 +75,8 @@ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value,
 	trace_ref(NULL),
 	thrdmap_ref(NULL),
 	action_ref(NULL),
-	func_ref_count(0),
 	value(value),
 	type(type),
-	original_type(ATOMIC_NOP),
-	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -114,11 +108,8 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	trace_ref(NULL),
 	thrdmap_ref(NULL),
 	action_ref(NULL),
-	func_ref_count(0),
 	value(value),
 	type(type),
-	original_type(ATOMIC_NOP),
-	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -154,11 +145,8 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 	trace_ref(NULL),
 	thrdmap_ref(NULL),
 	action_ref(NULL),
-	func_ref_count(0),
 	value(value),
 	type(type),
-	original_type(ATOMIC_NOP),
-	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -195,11 +183,8 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 	trace_ref(NULL),
 	thrdmap_ref(NULL),
 	action_ref(NULL),
-	func_ref_count(0),
 	value(value),
 	type(type),
-	original_type(ATOMIC_NOP),
-	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -787,16 +772,3 @@ cdsc::mutex * ModelAction::get_mutex() const
 	else
 		return NULL;
 }
-
-/** @brief Swap type with original type */
-void ModelAction::use_original_type()
-{
-	action_type_t tmp = type;
-	type = original_type;
-	original_type = tmp;
-
-	if (swap_flag)
-		swap_flag = false;
-	else
-		swap_flag = true;
-}