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]
/
nodestack.cc
diff --git
a/nodestack.cc
b/nodestack.cc
index 72c8d5cf5e46f7dca4241aa12f26958439ad15c3..a850478e95391a5eecf1ca26ee12c47e4ab4dfcb 100644
(file)
--- a/
nodestack.cc
+++ b/
nodestack.cc
@@
-4,7
+4,7
@@
#include "action.h"
#include "common.h"
#include "model.h"
#include "action.h"
#include "common.h"
#include "model.h"
-#include "threads.h"
+#include "threads
-model
.h"
/**
* @brief Node constructor
/**
* @brief Node constructor
@@
-49,7
+49,7
@@
Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
if (prevfi) {
*fi=*prevfi;
}
if (prevfi) {
*fi=*prevfi;
}
- if (parent->
enabled_array[i]==THREAD_ENABLED
) {
+ if (parent->
is_enabled(i)
) {
fi->enabled_count++;
}
if (i==currtid) {
fi->enabled_count++;
}
if (i==currtid) {
@@
-58,7
+58,7
@@
Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
}
//Do window processing
if (prevfairness != NULL) {
}
//Do window processing
if (prevfairness != NULL) {
- if (prevfairness -> parent->
enabled_array[i] == THREAD_ENABLED
)
+ if (prevfairness -> parent->
is_enabled(i)
)
fi->enabled_count--;
if (i==prevtid) {
fi->turns--;
fi->enabled_count--;
if (i==prevtid) {
fi->turns--;
@@
-267,13
+267,13
@@
thread_id_t Node::get_next_backtrack()
bool Node::is_enabled(Thread *t)
{
int thread_id=id_to_int(t->get_id());
bool Node::is_enabled(Thread *t)
{
int thread_id=id_to_int(t->get_id());
- return thread_id < num_threads && (enabled_array[thread_id]
== THREAD_EN
ABLED);
+ return thread_id < num_threads && (enabled_array[thread_id]
!= THREAD_DIS
ABLED);
}
bool Node::is_enabled(thread_id_t tid)
{
int thread_id=id_to_int(tid);
}
bool Node::is_enabled(thread_id_t tid)
{
int thread_id=id_to_int(tid);
- return thread_id < num_threads && (enabled_array[thread_id]
== THREAD_EN
ABLED);
+ return thread_id < num_threads && (enabled_array[thread_id]
!= THREAD_DIS
ABLED);
}
bool Node::has_priority(thread_id_t tid)
}
bool Node::has_priority(thread_id_t tid)