Defining the interfaces to add various regions to snapshot

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 54144f38fc322df9a79edf2e8d0c542f25d027d8..d3b42053fcee011ed32e47df7fef9822aadd144d 100644 (file)
--- a/model.h
+++ b/model.h
@@ -3,95 +3,72 @@
 
 #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 "tree.h"
+#include "action.h"
 
-#define VALUE_NONE -1
-
-typedef enum action_type {
-       THREAD_CREATE,
-       THREAD_YIELD,
-       THREAD_JOIN,
-       ATOMIC_READ,
-       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;
-               //currentIterator = actionTrace->getFirst();
-       }
-       ModelAction *get_diverge() { return diverge; }
-       action_list_t *get_trace() { return actionTrace; }
-private:
-       ModelAction *diverge;
-       /* unused for now; will be used when re-exploring this path? */
-       //MyListElement *currentIterator;
-       action_list_t *actionTrace;
-};
+/* Forward declaration */
+class TreeNode;
+class Backtrack;
 
 class ModelChecker {
 public:
        ModelChecker();
        ~ModelChecker();
        class Scheduler *scheduler;
-       Thread *system_thread;
 
-       void add_system_thread(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; }
-       ModelAction *get_last_conflict(ModelAction *act);
        void check_current_action(void);
-       void set_backtracking(ModelAction *act);
-       void print_trace(void);
+       void print_summary(void);
+       Thread * schedule_next_thread();
 
        int add_thread(Thread *t);
-       Thread *get_thread(thread_id_t tid) { return thread_map[tid]; }
+       void remove_thread(Thread *t);
+       Thread * get_thread(thread_id_t tid) { return thread_map[id_to_int(tid)]; }
 
-       void assign_id(Thread *t);
+       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();
+       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<thread_id_t, class Thread *> thread_map;
+       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< const int, class Thread * > > > thread_map;
        class TreeNode *rootNode, *currentNode;
-       std::list<class Backtrack *> backtrack_list;
+       std::list<class Backtrack *, MyAlloc< class Backtrack * > > backtrack_list;
 };
 
 extern ModelChecker *model;
 
-int thread_switch_to_master(ModelAction *act);
-
 #endif /* __MODEL_H__ */