change the namespace of mutex from std to cdsc

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index bb4ebb08f0b67cb3b30af855196c3b2b217b8013..fdc226b44e73389468d4eb82540c9e49e717ddea 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -16,6 +16,9 @@
 #include "stl-model.h"
 #include "params.h"
 
+#include "mutex.h"
+#include <condition_variable>
+
 /* Forward declaration */
 class Node;
 class NodeStack;
@@ -79,6 +82,11 @@ public:
        void add_thread(Thread *t);
        Thread * get_thread(thread_id_t tid) const;
        Thread * get_thread(const ModelAction *act) const;
+
+       pthread_t get_pthread_counter() { return pthread_counter; }
+       void incr_pthread_counter() { pthread_counter++; }
+       Thread * get_pthread(pthread_t pid);
+
        int get_promise_number(const Promise *promise) const;
 
        bool is_enabled(Thread *t) const;
@@ -116,9 +124,15 @@ public:
 
        action_list_t * get_action_trace() { return &action_trace; }
 
+       CycleGraph * const get_mo_graph() { return mo_graph; }
+
+       HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> mutex_map;
+       HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> cond_map;
+
        SNAPSHOTALLOC
 private:
        int get_execution_number() const;
+       pthread_t pthread_counter;
 
        ModelChecker *model;
 
@@ -132,6 +146,7 @@ private:
        bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
        bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
        void set_bad_synchronization();
+       void set_bad_sc_read();
        bool promises_expired() const;
        bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
        void wake_up_sleeping_actions(ModelAction *curr);
@@ -141,9 +156,10 @@ private:
        ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr);
-       bool process_write(ModelAction *curr);
+       bool process_write(ModelAction *curr, work_queue_t *work);
        bool process_fence(ModelAction *curr);
        bool process_mutex(ModelAction *curr);
+
        bool process_thread_action(ModelAction *curr);
        void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue);
        bool read_from(ModelAction *act, const ModelAction *rf);
@@ -160,7 +176,8 @@ private:
        void set_backtracking(ModelAction *act);
        bool set_latest_backtrack(ModelAction *act);
        Promise * pop_promise_to_resolve(const ModelAction *curr);
-       bool resolve_promise(ModelAction *curr, Promise *promise);
+       bool resolve_promise(ModelAction *curr, Promise *promise,
+                       work_queue_t *work);
        void compute_promises(ModelAction *curr);
        void compute_relseq_breakwrites(ModelAction *curr);
 
@@ -186,11 +203,12 @@ private:
        void propagate_clockvector(ModelAction *acquire, work_queue_t *work);
        bool resolve_release_sequences(void *location, work_queue_t *work_queue);
        void add_future_value(const ModelAction *writer, ModelAction *reader);
-
+       bool check_coherence_promise(const ModelAction *write, const ModelAction *read);
        ModelAction * get_uninitialized_action(const ModelAction *curr) const;
 
        action_list_t action_trace;
        SnapVector<Thread *> thread_map;
+       SnapVector<Thread *> pthread_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
@@ -201,6 +219,15 @@ private:
        HashTable<const void *, action_list_t *, uintptr_t, 4> condvar_waiters_map;
 
        HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+
+//     HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> mutex_map;
+
+       /**
+        * @brief List of currently-pending promises
+        *
+        * Promises are sorted by the execution order of the read(s) which
+        * created them
+        */
        SnapVector<Promise *> promises;
        SnapVector<struct PendingFutureValue> futurevalues;