don't include action.h from model.h

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 99a93cdc9fd3e33dad9cbc5a4ef21954354c1191..8ef825f3485a9e10079c528a96644cc2385d487d 100644 (file)
--- a/model.h
+++ b/model.h
@@ -8,25 +8,29 @@
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
+#include <inttypes.h>
 
 #include "mymemory.h"
-#include "action.h"
 #include "hashtable.h"
 #include "workqueue.h"
 #include "config.h"
 #include "modeltypes.h"
 
 /* Forward declaration */
+class Node;
 class NodeStack;
 class CycleGraph;
 class Promise;
 class Scheduler;
 class Thread;
+class ClockVector;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
 typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
 
+typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
+
 /**
  * Model checker parameter structure. Holds run-time configuration options for
  * the model checker.
@@ -117,6 +121,7 @@ public:
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
+       void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid) const;
        ModelAction * get_parent_action(thread_id_t tid) const;
@@ -148,7 +153,6 @@ private:
        modelclock_t get_next_seq_num();
 
        bool next_execution();
-       void set_current_action(ModelAction *act);
        ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, bool second_part_of_rmw);
@@ -160,7 +164,7 @@ private:
        bool read_from(ModelAction *act, const ModelAction *rf);
        bool check_action_enabled(ModelAction *curr);
 
-       bool take_step(ModelAction *curr);
+       Thread * take_step(ModelAction *curr);
 
        void check_recency(ModelAction *curr, const ModelAction *rf);
        ModelAction * get_last_conflict(ModelAction *act);