Remove unused functions and optimize data race checking for mem* operations

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 35368ef7fff3ca0bea12de7b375260e331cbded1..5357fe4b6501ca0025737c8c3f400b18e38cb6a7 100644 (file)
--- a/action.h
+++ b/action.h
@@ -116,7 +116,8 @@ public:
        uint64_t get_write_value() const;
        uint64_t get_return_value() const;
        ModelAction * get_reads_from() const { return reads_from; }
-       uint64_t get_time() const {return time;}
+       uint64_t get_time() const { return time; }
+       void set_time(uint64_t _time) { time = _time; }
        cdsc::mutex * get_mutex() const;
 
        void set_read_from(ModelAction *act);
@@ -139,6 +140,7 @@ public:
        bool is_trylock() const;
        bool is_unlock() const;
        bool is_wait() const;
+       bool is_timedwait() const;
        bool is_create() const;
        bool is_notify() const;
        bool is_notify_one() const;
@@ -192,11 +194,8 @@ public:
        /* to accomodate pthread create and join */
        Thread * thread_operand;
        void set_thread_operand(Thread *th) { thread_operand = th; }
-       void setTraceRef(sllnode<ModelAction *> *ref) { trace_ref = ref; }
-       void setThrdMapRef(sllnode<ModelAction *> *ref) { thrdmap_ref = ref; }
+
        void setActionRef(sllnode<ModelAction *> *ref) { action_ref = ref; }
-       sllnode<ModelAction *> * getTraceRef() { return trace_ref; }
-       sllnode<ModelAction *> * getThrdMapRef() { return thrdmap_ref; }
        sllnode<ModelAction *> * getActionRef() { return action_ref; }
 
        SNAPSHOTALLOC
@@ -233,8 +232,6 @@ private:
         */
        ClockVector *cv;
        ClockVector *rf_cv;
-       sllnode<ModelAction *> * trace_ref;
-       sllnode<ModelAction *> * thrdmap_ref;
        sllnode<ModelAction *> * action_ref;
 
        /** @brief The value written (for write or RMW; undefined for read) */