fix sleeping bug

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 595f6fa9d7d139af378584974d5fcc5e433fb0a0..b81858c87f6a815c2ea4d58c5fc46f2562d72534 100644 (file)
--- a/model.h
+++ b/model.h
@@ -16,16 +16,15 @@
 #include "context.h"
 #include "params.h"
 #include "classlist.h"
+#include "snapshot-interface.h"
 
 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 */
 };
 
 /** @brief The central structure for model-checking */
@@ -33,12 +32,9 @@ class ModelChecker {
 public:
        ModelChecker();
        ~ModelChecker();
-       void setParams(struct model_params params);
+       model_params * getParams();
        void run();
 
-       /** Restart the model checker, intended for pluggins. */
-       void restart();
-
        /** Exit the model checker, intended for pluggins. */
        void exit_model_checker();
 
@@ -46,6 +42,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; }
 
@@ -56,29 +53,50 @@ public:
 
        void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
+       uint64_t switch_thread(ModelAction *act);
+
+       void continueExecution(Thread *old);
+       void finishExecution(Thread *old);
+       void consumeAction();
+       void chooseThread(ModelAction *act, Thread *old);
+       Thread * getNextThread();
+       void handleChosenThread(Thread *old);
+       void handleNewValidThread(Thread *old, Thread *next);
+
+       void assert_bug(const char *msg, ...);
 
-       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 startChecker();
+       Thread * getInitThread() {return init_thread;}
+       Scheduler * getScheduler() {return scheduler;}
        MEMALLOC
 private:
-       /** Flag indicates whether to restart the model checker. */
-       bool restart_flag;
+       /** Snapshot id we return to restart. */
+       snapshot_id snapshot;
 
        /** 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;
 
+       unsigned int curr_thread_num;
+
+       Thread * chosen_thread;
+
+       bool thread_chosen;
+
+       modelclock_t checkfree;
+
        unsigned int get_num_threads() const;
 
-       bool next_execution();
+       void finish_execution(bool moreexecutions);
        bool should_terminate_execution();
 
        Thread * get_next_thread();
@@ -88,8 +106,6 @@ private:
 
        ModelVector<TraceAnalysis *> trace_analyses;
 
-       /** @bref Implement restart. */
-       void do_restart();
        /** @bref Plugin that can inspect new actions. */
        TraceAnalysis *inspect_plugin;
        /** @brief The cumulative execution stats */
@@ -99,10 +115,10 @@ private:
        void print_bugs() const;
        void print_execution(bool printbugs) const;
        void print_stats() const;
-
-       friend void user_main_wrapper();
 };
 
 extern ModelChecker *model;
-extern bool modelchecker_started;
+void parse_options(struct model_params *params);
+void install_trace_analyses(ModelExecution *execution);
+
 #endif /* __MODEL_H__ */