projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mutex: move mutex.h to standard name/location
[model-checker.git]
/
model.cc
diff --git
a/model.cc
b/model.cc
index c0cc93eb0a80523eefc48f2fe7ec3c8119d8619c..b3b517caed9c087b0ed1daaeb9a271c4a3a7bc20 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-1,5
+1,6
@@
#include <stdio.h>
#include <algorithm>
#include <stdio.h>
#include <algorithm>
+#include <mutex>
#include "model.h"
#include "action.h"
#include "model.h"
#include "action.h"
@@
-11,7
+12,6
@@
#include "cyclegraph.h"
#include "promise.h"
#include "datarace.h"
#include "cyclegraph.h"
#include "promise.h"
#include "datarace.h"
-#include "mutex.h"
#include "threads-model.h"
#define INITIAL_THREAD_ID 0
#include "threads-model.h"
#define INITIAL_THREAD_ID 0
@@
-116,6
+116,10
@@
modelclock_t ModelChecker::get_next_seq_num()
return ++priv->used_sequence_numbers;
}
return ++priv->used_sequence_numbers;
}
+Node * ModelChecker::get_curr_node() {
+ return node_stack->get_head();
+}
+
/**
* @brief Choose the next thread to execute.
*
/**
* @brief Choose the next thread to execute.
*
@@
-767,10
+771,9
@@
Thread * ModelChecker::check_current_action(ModelAction *curr)
return get_next_thread(NULL);
}
return get_next_thread(NULL);
}
- wake_up_sleeping_actions(curr);
-
ModelAction *newcurr = initialize_curr_action(curr);
ModelAction *newcurr = initialize_curr_action(curr);
+ wake_up_sleeping_actions(curr);
/* Add the action to lists before any other model-checking tasks */
if (!second_part_of_rmw)
/* Add the action to lists before any other model-checking tasks */
if (!second_part_of_rmw)