#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;
- 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;
-};
+/* Forward declaration */
+class NodeStack;
class ModelChecker {
public:
int add_thread(Thread *t);
void remove_thread(Thread *t);
- Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
+ Thread * get_thread(thread_id_t tid) { return (*thread_map)[id_to_int(tid)]; }
- int get_next_id();
+ thread_id_t get_next_id();
+ int get_num_threads();
+ 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();
+ ModelAction * get_next_backtrack();
void reset_to_initial_state();
- class ModelAction *current_action;
- Backtrack *exploring;
+ void print_list(action_list_t *list);
+
+ ModelAction *current_action;
+ ModelAction *diverge;
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;
- std::list<class Backtrack *> backtrack_list;
+ std::map<int, class Thread *> *thread_map;
+ class NodeStack *node_stack;
+ ModelAction *next_backtrack;
};
extern ModelChecker *model;