replace non-fatal error messages with ASSERT()'s

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index a9016338508eac25e4f1b97bc76a3e429d51fa40..2933f54cd7e5d4571c94f36ed4f652a3d34dcd1c 100644 (file)
--- a/model.h
+++ b/model.h
@@ -1,20 +1,87 @@
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
+#include <list>
+#include <map>
+#include <cstddef>
+#include <ucontext.h>
+
 #include "schedule.h"
+#include "libthreads.h"
+#include "libatomic.h"
+#include "threads.h"
+#include "action.h"
+
+/* Forward declaration */
+class TreeNode;
+
+class Backtrack {
+public:
+       Backtrack(ModelAction *d, action_list_t *t) {
+               diverge = d;
+               actionTrace = t;
+               iter = actionTrace->begin();
+       }
+       ModelAction * get_diverge() { return diverge; }
+       action_list_t * get_trace() { return actionTrace; }
+       void advance_state() { iter++; }
+       ModelAction * get_state() {
+               return iter == actionTrace->end() ? NULL : *iter;
+       }
+private:
+       ModelAction *diverge;
+       action_list_t *actionTrace;
+       /* points to position in actionTrace as we replay */
+       action_list_t::iterator iter;
+};
 
 class ModelChecker {
 public:
        ModelChecker();
        ~ModelChecker();
        class Scheduler *scheduler;
-       struct thread *system_thread;
 
-       void add_system_thread(struct thread *t);
-       void assign_id(struct thread *t);
+       void set_system_context(ucontext_t *ctxt) { system_context = ctxt; }
+       ucontext_t * get_system_context(void) { return system_context; }
+
+       void set_current_action(ModelAction *act) { current_action = act; }
+       void check_current_action(void);
+       void print_summary(void);
+       Thread * schedule_next_thread();
 
+       int add_thread(Thread *t);
+       void remove_thread(Thread *t);
+       Thread * get_thread(thread_id_t tid) { return thread_map[id_to_int(tid)]; }
+
+       thread_id_t get_next_id();
+       int get_next_seq_num();
+
+       int switch_to_master(ModelAction *act);
+
+       bool next_execution();
 private:
-       int used_thread_id;
+       int next_thread_id;
+       int used_sequence_numbers;
+       int num_executions;
+
+       ModelAction * get_last_conflict(ModelAction *act);
+       void set_backtracking(ModelAction *act);
+       thread_id_t advance_backtracking_state();
+       thread_id_t get_next_replay_thread();
+       Backtrack * get_next_backtrack();
+       void reset_to_initial_state();
+
+       void print_list(action_list_t *list);
+
+       class ModelAction *current_action;
+       Backtrack *exploring;
+       thread_id_t nextThread;
+
+       ucontext_t *system_context;
+       action_list_t *action_trace;
+       std::map<int, class Thread *> thread_map;
+       class TreeNode *rootNode, *currentNode;
+       std::list<class Backtrack *> backtrack_list;
 };
 
 extern ModelChecker *model;