split header out to action.h

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index aac968a9f14077ca17953f934c82881266dc781b..83db4d8f7c3985d72e1b7d151a259027db7fee55 100644 (file)
--- a/model.h
+++ b/model.h
@@ -4,45 +4,16 @@
 #include <list>
 #include <map>
 #include <cstddef>
+#include <ucontext.h>
 
 #include "schedule.h"
 #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;
-};
+/* Forward declaration */
+class TreeNode;
 
 class Backtrack {
 public:
@@ -69,9 +40,9 @@ 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; }
        void check_current_action(void);
@@ -102,6 +73,7 @@ private:
        Backtrack *exploring;
        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;