rename mypthread.h to pthread.h

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index d13cc7215c1cfe72fb90476d268611b6259576fc..f14628bfde2dbe004f755ad6631b3c36fc163537 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -14,7 +14,7 @@
 #include "modeltypes.h"
 #include "stl-model.h"
 #include "params.h"
-#include "mypthread.h"
+#include "pthread.h"
 #include "mutex.h"
 #include <condition_variable>
 #include "classlist.h"
@@ -52,13 +52,13 @@ struct release_seq {
 class ModelExecution {
 public:
        ModelExecution(ModelChecker *m,
-                       Scheduler *scheduler,
-                       NodeStack *node_stack);
+                                                                Scheduler *scheduler,
+                                                                NodeStack *node_stack);
        ~ModelExecution();
 
        struct model_params * get_params() const { return params; }
        void setParams(struct model_params * _params) {params = _params;}
-  
+
        Thread * take_step(ModelAction *curr);
 
        void print_summary() const;
@@ -102,25 +102,24 @@ public:
        bool is_deadlocked() const;
 
        action_list_t * get_action_trace() { return &action_trace; }
-
+       Fuzzer * getFuzzer();
        CycleGraph * const get_mo_graph() { return mo_graph; }
-  HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> * getCondMap() {return &cond_map;}
-  HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
-  
+       HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> * getCondMap() {return &cond_map;}
+       HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
+
        SNAPSHOTALLOC
 private:
        int get_execution_number() const;
 
        ModelChecker *model;
 
-  struct model_params * params;
+       struct model_params * params;
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
 
        bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
        void set_bad_synchronization();
-       void set_bad_sc_read();
        bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
        void wake_up_sleeping_actions(ModelAction *curr);
        modelclock_t get_next_seq_num();
@@ -128,8 +127,8 @@ private:
        bool next_execution();
        ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
-  bool process_read(ModelAction *curr, ModelVector<ModelAction *> * rf_set);
-       bool process_write(ModelAction *curr);
+       void process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
+       void process_write(ModelAction *curr);
        bool process_fence(ModelAction *curr);
        bool process_mutex(ModelAction *curr);
 
@@ -142,21 +141,19 @@ private:
        ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
        ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
        ModelAction * get_last_unlock(ModelAction *curr) const;
-  ModelVector<ModelAction *> * build_may_read_from(ModelAction *curr);
+       SnapVector<ModelAction *> * build_may_read_from(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
 
-       template <typename rf_type>
-       bool r_modification_order(ModelAction *curr, const rf_type *rf);
-
-       bool w_modification_order(ModelAction *curr);
+       bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset);
+       void w_modification_order(ModelAction *curr);
        void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
-  bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads) const;
+       bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads) const;
        ModelAction * get_uninitialized_action(const ModelAction *curr) const;
 
        action_list_t action_trace;
        SnapVector<Thread *> thread_map;
        SnapVector<Thread *> pthread_map;
-  uint32_t pthread_counter;
+       uint32_t pthread_counter;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
@@ -168,7 +165,7 @@ private:
 
        HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
 
-  HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> mutex_map;
+       HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> mutex_map;
        HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> cond_map;
 
        /**
@@ -206,7 +203,9 @@ private:
         */
        CycleGraph * const mo_graph;
 
+       Fuzzer * fuzzer;
+
        Thread * action_select_next_thread(const ModelAction *curr) const;
 };
 
-#endif /* __EXECUTION_H__ */
+#endif /* __EXECUTION_H__ */