fix tabbing

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 65c250a63dc2d5b3220596b0c234d90e5b97432a..9ad7469af605755094d7213b7118396c42b7c5d3 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -14,20 +14,10 @@
 #include "modeltypes.h"
 #include "stl-model.h"
 #include "params.h"
-
+#include "mypthread.h"
 #include "mutex.h"
 #include <condition_variable>
-
-/* Forward declaration */
-class Node;
-class NodeStack;
-class CycleGraph;
-class Scheduler;
-class Thread;
-class ClockVector;
-struct model_snapshot_members;
-class ModelChecker;
-struct bug_message;
+#include "classlist.h"
 
 /** @brief Shorthand for a list of release sequence heads */
 typedef ModelVector<const ModelAction *> rel_heads_list_t;
@@ -62,12 +52,12 @@ struct release_seq {
 class ModelExecution {
 public:
        ModelExecution(ModelChecker *m,
-                       const struct model_params *params,
-                       Scheduler *scheduler,
-                       NodeStack *node_stack);
+                                                                Scheduler *scheduler,
+                                                                NodeStack *node_stack);
        ~ModelExecution();
 
-       const struct model_params * get_params() const { return params; }
+       struct model_params * get_params() const { return params; }
+       void setParams(struct model_params * _params) {params = _params;}
 
        Thread * take_step(ModelAction *curr);
 
@@ -80,7 +70,7 @@ public:
        Thread * get_thread(thread_id_t tid) const;
        Thread * get_thread(const ModelAction *act) const;
 
-       pthread_t get_pthread_counter() { return pthread_counter; }
+       uint32_t get_pthread_counter() { return pthread_counter; }
        void incr_pthread_counter() { pthread_counter++; }
        Thread * get_pthread(pthread_t pid);
 
@@ -110,21 +100,20 @@ public:
        void print_infeasibility(const char *prefix) const;
        bool is_infeasible() const;
        bool is_deadlocked() const;
-       bool too_many_steps() 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;
 
-       const model_params * const params;
+       struct model_params * params;
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
@@ -139,7 +128,7 @@ 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_read(ModelAction *curr, ModelVector<ModelAction *> * rf_set);
        bool process_write(ModelAction *curr);
        bool process_fence(ModelAction *curr);
        bool process_mutex(ModelAction *curr);
@@ -153,7 +142,7 @@ 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);
+       ModelVector<ModelAction *> * build_may_read_from(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
 
        template <typename rf_type>
@@ -161,13 +150,13 @@ private:
 
        bool 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;
-       pthread_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. */
@@ -179,7 +168,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;
 
        /**
@@ -217,7 +206,9 @@ private:
         */
        CycleGraph * const mo_graph;
 
+       Fuzzer * fuzzer;
+
        Thread * action_select_next_thread(const ModelAction *curr) const;
 };
 
-#endif /* __EXECUTION_H__ */
+#endif/* __EXECUTION_H__ */