projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Defining the interfaces to add various regions to snapshot
[c11tester.git]
/
model.cc~
diff --git
a/model.cc~
b/model.cc~
index bd4a300880dcfe6870776f394776234662f0728b..5ecad250c9d35138a9573a2904643bef5f887cd6 100644
(file)
--- a/
model.cc~
+++ b/
model.cc~
@@
-4,6
+4,8
@@
#include "action.h"
#include "tree.h"
#include "schedule.h"
#include "action.h"
#include "tree.h"
#include "schedule.h"
+#include "snapshot-interface.h"
+#undef DEBUG
#include "common.h"
#define INITIAL_THREAD_ID 0
#include "common.h"
#define INITIAL_THREAD_ID 0
@@
-54,11
+56,12
@@
ModelChecker::ModelChecker()
rootNode = new TreeNode();
currentNode = rootNode;
action_trace = new action_list_t();
rootNode = new TreeNode();
currentNode = rootNode;
action_trace = new action_list_t();
+ global_vec = snapshot_utils::ReturnGlobalSegmentsToSnapshot();
}
ModelChecker::~ModelChecker()
{
}
ModelChecker::~ModelChecker()
{
- std::map<int, class Thread *, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
+ std::map<int, class Thread *,
std::less< int >,
MyAlloc< std::pair< int, class Thread * > > >::iterator it;
for (it = thread_map.begin(); it != thread_map.end(); it++)
delete (*it).second;
thread_map.clear();
for (it = thread_map.begin(); it != thread_map.end(); it++)
delete (*it).second;
thread_map.clear();
@@
-72,7
+75,7
@@
ModelChecker::~ModelChecker()
void ModelChecker::reset_to_initial_state()
{
DEBUG("+++ Resetting to initial state +++\n");
void ModelChecker::reset_to_initial_state()
{
DEBUG("+++ Resetting to initial state +++\n");
- std::map<int, class Thread *, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
+ std::map<int, class Thread *,
std::less< int >,
MyAlloc< std::pair< int, class Thread * > > >::iterator it;
for (it = thread_map.begin(); it != thread_map.end(); it++)
delete (*it).second;
thread_map.clear();
for (it = thread_map.begin(); it != thread_map.end(); it++)
delete (*it).second;
thread_map.clear();