main, model: don't 'initialize' system_context

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 73605dbb2616aa26351fe8a4515b3eb7721ed77a..dbf0654fc21b22aec59cb1c1d42ec6fef094a451 100644 (file)
--- a/model.h
+++ b/model.h
@@ -23,29 +23,30 @@ class NodeStack;
 class CycleGraph;
 class Promise;
 
+/**
+ * Model checker parameter structure. Holds run-time configuration options for
+ * the model checker.
+ */
+struct model_params {
+};
+
 /** @brief The central structure for model-checking */
 class ModelChecker {
 public:
-       ModelChecker();
+       ModelChecker(struct model_params params);
        ~ModelChecker();
 
-       /** The scheduler to use: tracks the running/ready Threads */
-       Scheduler *scheduler;
-
-       /** Stores the context for the main model-checking system thread (call
-        * once)
-        * @param ctxt The system context structure
-        */
-       void set_system_context(ucontext_t *ctxt) { system_context = ctxt; }
-
        /** @returns the context for the main model-checking system thread */
-       ucontext_t * get_system_context(void) { return system_context; }
+       ucontext_t * get_system_context() { return &system_context; }
 
        void check_current_action(void);
-       void print_summary(void);
+
+       /** Prints an execution summary with trace information. */
+       void print_summary();
+
        Thread * schedule_next_thread();
 
-       int add_thread(Thread *t);
+       void add_thread(Thread *t);
        void remove_thread(Thread *t);
        Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
 
@@ -53,6 +54,9 @@ public:
        int get_num_threads();
        modelclock_t get_next_seq_num();
 
+       /** @return The currently executing Thread. */
+       Thread * get_current_thread() { return scheduler->get_current_thread(); }
+
        int switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
@@ -60,12 +64,19 @@ public:
        bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
+       void finish_execution();
+
        MEMALLOC
 private:
+       /** The scheduler to use: tracks the running/ready Threads */
+       Scheduler *scheduler;
+
        int next_thread_id;
        modelclock_t used_sequence_numbers;
        int num_executions;
 
+       const model_params params;
+
        /**
         * Stores the ModelAction for the current thread action.  Call this
         * immediately before switching from user- to system-context to pass
@@ -74,6 +85,8 @@ private:
         */
        void set_current_action(ModelAction *act) { current_action = act; }
 
+       bool take_step();
+
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        thread_id_t get_next_replay_thread();
@@ -88,14 +101,15 @@ private:
        ModelAction * get_last_seq_cst(const void *location);
        void build_reads_from_past(ModelAction *curr);
        ModelAction * process_rmw(ModelAction * curr);
+       void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
        void r_modification_order(ModelAction * curr, const ModelAction *rf);
        void w_modification_order(ModelAction * curr);
-       
+
        ModelAction *current_action;
        ModelAction *diverge;
        thread_id_t nextThread;
 
-       ucontext_t *system_context;
+       ucontext_t system_context;
        action_list_t *action_trace;
        HashTable<int, Thread *, int> *thread_map;