threads: save id within class Thread

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 05cdf5ccb54b2f41ee4e45519e477ce0e9021a1b..64d052fcbf9b5cab928b3ebfbb62554aa7e42939 100644 (file)
--- a/model.h
+++ b/model.h
@@ -3,11 +3,13 @@
 
 #include <list>
 #include <map>
+#include <cstddef>
 
 #include "schedule.h"
 #include "libthreads.h"
 #include "libatomic.h"
-#include "threads_internal.h"
+#include "threads.h"
+#include "tree.h"
 
 #define VALUE_NONE -1
 
@@ -19,16 +21,47 @@ typedef enum action_type {
        ATOMIC_WRITE
 } action_type_t;
 
+typedef std::list<class ModelAction *> action_list_t;
+
 class ModelAction {
 public:
        ModelAction(action_type_t type, memory_order order, void *loc, int value);
        void print(void);
+
+       thread_id_t get_tid() { return tid; }
+       action_type get_type() { return type; }
+       memory_order get_mo() { return order; }
+       void * get_location() { return location; }
+
+       TreeNode * get_node() { return node; }
+       void set_node(TreeNode *n) { node = n; }
 private:
        action_type type;
        memory_order order;
        void *location;
        thread_id_t tid;
        int value;
+       TreeNode *node;
+};
+
+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 {
@@ -43,18 +76,33 @@ public:
        void set_current_action(ModelAction *act) { current_action = act; }
        void check_current_action(void);
        void print_trace(void);
+       Thread * schedule_next_thread();
 
        int add_thread(Thread *t);
-       Thread *get_thread(thread_id_t tid) { return thread_map[tid]; }
+       Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
 
-       void assign_id(Thread *t);
+       int get_next_id();
 
        int switch_to_master(ModelAction *act);
+
+       bool next_execution();
 private:
        int used_thread_id;
+       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();
+
        class ModelAction *current_action;
-       std::list<class ModelAction *> action_trace;
+       Backtrack *exploring;
+       thread_id_t nextThread;
+
+       action_list_t *action_trace;
        std::map<thread_id_t, class Thread *> thread_map;
+       class TreeNode *rootNode, *currentNode;
+       std::list<class Backtrack *> backtrack_list;
 };
 
 extern ModelChecker *model;