Add datarace support for atomics and calloc

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 166eb12d21de204e9b69e5bfd0872d8f55cbab23..a3a7bc0ee8f22a059a1b9572d82a2f266f9e2a04 100644 (file)
--- a/model.h
+++ b/model.h
@@ -21,11 +21,11 @@ typedef SnapList<ModelAction *> action_list_t;
 
 /** @brief Model checker execution stats */
 struct execution_stats {
-       int num_total; /**< @brief Total number of executions */
-       int num_infeasible; /**< @brief Number of infeasible executions */
-       int num_buggy_executions; /** @brief Number of buggy executions */
-       int num_complete; /**< @brief Number of feasible, non-buggy, complete executions */
-       int num_redundant; /**< @brief Number of redundant, aborted executions */
+       int num_total;  /**< @brief Total number of executions */
+       int num_infeasible;     /**< @brief Number of infeasible executions */
+       int num_buggy_executions;       /** @brief Number of buggy executions */
+       int num_complete;       /**< @brief Number of feasible, non-buggy, complete executions */
+       int num_redundant;      /**< @brief Number of redundant, aborted executions */
 };
 
 /** @brief The central structure for model-checking */
@@ -33,7 +33,7 @@ class ModelChecker {
 public:
        ModelChecker();
        ~ModelChecker();
-       void setParams(struct model_params params);
+       model_params * getParams();
        void run();
 
        /** Restart the model checker, intended for pluggins. */
@@ -46,6 +46,7 @@ public:
        ucontext_t * get_system_context() { return &system_context; }
 
        ModelExecution * get_execution() const { return execution; }
+       ModelHistory * get_history() const { return history; }
 
        int get_execution_number() const { return execution_number; }
 
@@ -58,11 +59,16 @@ public:
        uint64_t switch_to_master(ModelAction *act);
 
        bool assert_bug(const char *msg, ...);
+
        void assert_user_bug(const char *msg);
 
-  model_params params;
-       void add_trace_analysis(TraceAnalysis *a) {     trace_analyses.push_back(a); }
-       void set_inspect_plugin(TraceAnalysis *a) {     inspect_plugin=a;       }
+       model_params params;
+       void add_trace_analysis(TraceAnalysis *a) {     trace_analyses.push_back(a); }
+       void set_inspect_plugin(TraceAnalysis *a) {     inspect_plugin=a;       }
+       void startMainThread();
+       void startChecker();
+       Thread * getInitThread() {return init_thread;}
+       Scheduler * getScheduler() {return scheduler;}
        MEMALLOC
 private:
        /** Flag indicates whether to restart the model checker. */
@@ -70,8 +76,9 @@ private:
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
-       NodeStack * const node_stack;
+       ModelHistory * history;
        ModelExecution *execution;
+       Thread * init_thread;
 
        int execution_number;
 
@@ -103,5 +110,4 @@ private:
 };
 
 extern ModelChecker *model;
-
-#endif /* __MODEL_H__ */
+#endif /* __MODEL_H__ */