Make our pthread id starts from 2. Reserve id 1 for main thread

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index 85a2a766b3583eabb2504bdc5537348520a840b9..d65695446486e58a929196335660d8c3172cb94d 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -41,10 +41,8 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        trace_ref(NULL),
        thrdmap_ref(NULL),
        action_ref(NULL),
-       func_act_ref(NULL),
        value(value),
        type(type),
-       original_type(ATOMIC_NOP),
        order(order),
        original_order(order),
        seq_number(ACTION_INITIAL_CLOCK)
@@ -79,7 +77,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value,
        action_ref(NULL),
        value(value),
        type(type),
-       original_type(ATOMIC_NOP),
        order(order),
        original_order(order),
        seq_number(ACTION_INITIAL_CLOCK)
@@ -113,7 +110,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        action_ref(NULL),
        value(value),
        type(type),
-       original_type(ATOMIC_NOP),
        order(order),
        original_order(order),
        seq_number(ACTION_INITIAL_CLOCK)
@@ -151,7 +147,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        action_ref(NULL),
        value(value),
        type(type),
-       original_type(ATOMIC_NOP),
        order(order),
        original_order(order),
        seq_number(ACTION_INITIAL_CLOCK)
@@ -190,7 +185,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        action_ref(NULL),
        value(value),
        type(type),
-       original_type(ATOMIC_NOP),
        order(order),
        original_order(order),
        seq_number(ACTION_INITIAL_CLOCK)
@@ -778,11 +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;
-}