Change initialize a bit

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 634748130ce51713d014c07903f10edf4d3a8fe1..e35457e1eea77c9dd653db444303d6284caa7279 100644 (file)
--- a/model.h
+++ b/model.h
@@ -31,14 +31,10 @@ public:
        ModelChecker();
        ~ModelChecker();
        model_params * getParams();
-       void run();
 
        /** Exit the model checker, intended for pluggins. */
        void exit_model_checker();
 
-       /** @returns the context for the main model-checking system thread */
-       ucontext_t * get_system_context() { return &system_context; }
-
        ModelExecution * get_execution() const { return execution; }
        ModelHistory * get_history() const { return history; }
 
@@ -48,9 +44,9 @@ public:
        Thread * get_thread(const ModelAction *act) const;
 
        Thread * get_current_thread() const;
+       thread_id_t get_current_thread_id() const;
 
-       void switch_from_master(Thread *thread);
-       uint64_t switch_to_master(ModelAction *act);
+       uint64_t switch_thread(ModelAction *act);
 
        void assert_bug(const char *msg, ...);
 
@@ -75,6 +71,17 @@ private:
 
        int execution_number;
 
+       unsigned int curr_thread_num;
+       Thread * chosen_thread;
+       bool break_execution;
+
+       void startRunExecution(Thread *old);
+       void finishRunExecution(Thread *old);
+       Thread * getNextThread(Thread *old);
+       bool handleChosenThread(Thread *old);
+
+       modelclock_t checkfree;
+
        unsigned int get_num_threads() const;
 
        void finish_execution(bool moreexecutions);
@@ -83,9 +90,8 @@ private:
        Thread * get_next_thread();
        void reset_to_initial_state();
 
-       ucontext_t system_context;
-
        ModelVector<TraceAnalysis *> trace_analyses;
+       char random_state[256];
 
        /** @bref Plugin that can inspect new actions. */
        TraceAnalysis *inspect_plugin;
@@ -101,5 +107,6 @@ private:
 extern ModelChecker *model;
 void parse_options(struct model_params *params);
 void install_trace_analyses(ModelExecution *execution);
+void createModelIfNotExist();
 
 #endif /* __MODEL_H__ */