fix page alignment issue...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 83db4d8f7c3985d72e1b7d151a259027db7fee55..99ec69e62eb6908e1db1ea104f0c05222b0f3d9c 100644 (file)
--- a/model.h
+++ b/model.h
@@ -3,37 +3,20 @@
 
 #include <list>
 #include <map>
+#include <vector>
 #include <cstddef>
 #include <ucontext.h>
 
 #include "schedule.h"
+#include "mymemory.h"
+#include <utility>
 #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 NodeStack;
 
 class ModelChecker {
 public:
@@ -51,33 +34,38 @@ public:
 
        int add_thread(Thread *t);
        void remove_thread(Thread *t);
-       Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
+       Thread * get_thread(thread_id_t tid) { return thread_map[id_to_int(tid)]; }
 
-       int get_next_id();
+       thread_id_t get_next_id();
+       int get_next_seq_num();
 
        int switch_to_master(ModelAction *act);
 
        bool next_execution();
+
+       MEMALLOC
 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();
+       ModelAction * get_next_backtrack();
        void reset_to_initial_state();
 
-       class ModelAction *current_action;
-       Backtrack *exploring;
+       void print_list(action_list_t *list);
+
+       ModelAction *current_action;
+       ModelAction *diverge;
        thread_id_t nextThread;
 
        ucontext_t *system_context;
        action_list_t *action_trace;
-       std::map<thread_id_t, class Thread *> thread_map;
-       class TreeNode *rootNode, *currentNode;
-       std::list<class Backtrack *> backtrack_list;
+       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< const int, class Thread * > > > thread_map;
+       class NodeStack *node_stack;
+       ModelAction *next_backtrack;
 };
 
 extern ModelChecker *model;