Add datarace support for atomics and calloc

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 4d8558e270613e968cccb01ea282f4af04d36a70..a3a7bc0ee8f22a059a1b9572d82a2f266f9e2a04 100644 (file)
--- a/model.h
+++ b/model.h
@@ -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. */
@@ -59,12 +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;       }
-
+       void startMainThread();
+       void startChecker();
+       Thread * getInitThread() {return init_thread;}
+       Scheduler * getScheduler() {return scheduler;}
        MEMALLOC
 private:
        /** Flag indicates whether to restart the model checker. */
@@ -72,9 +76,9 @@ private:
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
-       NodeStack * const node_stack;
+       ModelHistory * history;
        ModelExecution *execution;
-       ModelHistory *history;
+       Thread * init_thread;
 
        int execution_number;
 
@@ -106,5 +110,4 @@ private:
 };
 
 extern ModelChecker *model;
-
 #endif /* __MODEL_H__ */