model: index thread_map by int, not thread_id_t

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 14d4372da7943d5bc4eb4199145b1266f95f3d2c..b2bcb96f54a79513a6eb7c7890c796a4203f0299 100644 (file)
--- a/model.h
+++ b/model.h
@@ -2,31 +2,37 @@
 #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"
 
-#define VALUE_NONE -1
+/* Forward declaration */
+class TreeNode;
 
-typedef enum action_type {
-       THREAD_CREATE,
-       THREAD_YIELD,
-       THREAD_JOIN,
-       ATOMIC_READ,
-       ATOMIC_WRITE
-} action_type_t;
-
-class ModelAction {
+class Backtrack {
 public:
-       ModelAction(action_type_t type, memory_order order, void *loc, int value);
-       void print(void);
+       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:
-       action_type type;
-       memory_order order;
-       void *location;
-       thread_id_t tid;
-       int value;
+       ModelAction *diverge;
+       action_list_t *actionTrace;
+       /* points to position in actionTrace as we replay */
+       action_list_t::iterator iter;
 };
 
 class ModelChecker {
@@ -34,19 +40,44 @@ 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_trace(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 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();
+       Backtrack * get_next_backtrack();
+       void reset_to_initial_state();
+
        class ModelAction *current_action;
-       std::list<class ModelAction *> action_trace;
+       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;