projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit: branch 'work'
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index e8a8c5eb9e868dc2d4dca77e647d2d97484fed50..4718c503f9eac77a106d9505d49aca410b741d5b 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-3,10
+3,13
@@
#include <list>
#include <map>
#include <list>
#include <map>
+#include <vector>
#include <cstddef>
#include <ucontext.h>
#include "schedule.h"
#include <cstddef>
#include <ucontext.h>
#include "schedule.h"
+#include "mymemory.h"
+#include <utility>
#include "libthreads.h"
#include "libatomic.h"
#include "threads.h"
#include "libthreads.h"
#include "libatomic.h"
#include "threads.h"
@@
-39,6
+42,7
@@
public:
int switch_to_master(ModelAction *act);
bool next_execution();
int switch_to_master(ModelAction *act);
bool next_execution();
+ MEMALLOC
private:
int next_thread_id;
int used_sequence_numbers;
private:
int next_thread_id;
int used_sequence_numbers;
@@
-58,7
+62,7
@@
private:
ucontext_t *system_context;
action_list_t *action_trace;
ucontext_t *system_context;
action_list_t *action_trace;
- std::map<int, class Thread *> thread_map;
+ std::map<int, class Thread *
, std::less< int >, MyAlloc< std::pair< const int, class Thread * > >
> thread_map;
class NodeStack *node_stack;
ModelAction *next_backtrack;
};
class NodeStack *node_stack;
ModelAction *next_backtrack;
};