projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
schedule: add is_enabled() function
[model-checker.git]
/
nodestack.cc
diff --git
a/nodestack.cc
b/nodestack.cc
index c364df9f7613178e2453d05bd667f64f44ed4fde..4cf89500fc1faba0f98714173fbd4eca557edefa 100644
(file)
--- a/
nodestack.cc
+++ b/
nodestack.cc
@@
-4,6
+4,7
@@
#include "action.h"
#include "common.h"
#include "model.h"
#include "action.h"
#include "common.h"
#include "model.h"
+#include "threads.h"
/**
* @brief Node constructor
/**
* @brief Node constructor
@@
-46,7
+47,7
@@
Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
if (prevfi) {
*fi=*prevfi;
}
if (prevfi) {
*fi=*prevfi;
}
- if (parent->enabled_array[i]) {
+ if (parent->enabled_array[i]
==THREAD_ENABLED
) {
fi->enabled_count++;
}
if (i==currtid) {
fi->enabled_count++;
}
if (i==currtid) {
@@
-55,7
+56,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])
+ if (prevfairness -> parent->enabled_array[i]
== THREAD_ENABLED
)
fi->enabled_count--;
if (i==prevtid) {
fi->turns--;
fi->enabled_count--;
if (i==prevtid) {
fi->turns--;
@@
-215,15
+216,15
@@
bool Node::read_from_empty() {
* Mark the appropriate backtracking information for exploring a thread choice.
* @param act The ModelAction to explore
*/
* Mark the appropriate backtracking information for exploring a thread choice.
* @param act The ModelAction to explore
*/
-void Node::explore_child(ModelAction *act,
bool
* is_enabled)
+void Node::explore_child(ModelAction *act,
enabled_type_t
* is_enabled)
{
if ( ! enabled_array )
{
if ( ! enabled_array )
- enabled_array=(
bool *)model_malloc(sizeof(bool
)*num_threads);
+ enabled_array=(
enabled_type_t *)model_malloc(sizeof(enabled_type_t
)*num_threads);
if (is_enabled != NULL)
if (is_enabled != NULL)
- memcpy(enabled_array, is_enabled, sizeof(
bool
)*num_threads);
+ memcpy(enabled_array, is_enabled, sizeof(
enabled_type_t
)*num_threads);
else {
for(int i=0;i<num_threads;i++)
else {
for(int i=0;i<num_threads;i++)
- enabled_array[i]=
false
;
+ enabled_array[i]=
THREAD_DISABLED
;
}
explore(act->get_tid());
}
explore(act->get_tid());
@@
-264,13
+265,18
@@
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]
;
+ return thread_id < num_threads &&
(enabled_array[thread_id] == THREAD_ENABLED)
;
}
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];
+ return thread_id < num_threads && (enabled_array[thread_id] == THREAD_ENABLED);
+}
+
+bool Node::has_priority(thread_id_t tid)
+{
+ return fairness[id_to_int(tid)].priority;
}
/**
}
/**
@@
-356,16
+362,18
@@
void Node::explore(thread_id_t tid)
explored_children[i] = true;
}
explored_children[i] = true;
}
-NodeStack::NodeStack()
- : total_nodes(0)
+NodeStack::NodeStack() :
+ node_list(1, new Node()),
+ iter(0),
+ total_nodes(0)
{
{
- node_list.push_back(new Node());
total_nodes++;
total_nodes++;
- iter = 0;
}
NodeStack::~NodeStack()
{
}
NodeStack::~NodeStack()
{
+ for (unsigned int i = 0; i < node_list.size(); i++)
+ delete node_list[i];
}
void NodeStack::print()
}
void NodeStack::print()
@@
-383,7
+391,7
@@
void NodeStack::print()
/** Note: The is_enabled set contains what actions were enabled when
* act was chosen. */
/** Note: The is_enabled set contains what actions were enabled when
* act was chosen. */
-ModelAction * NodeStack::explore_action(ModelAction *act,
bool
* is_enabled)
+ModelAction * NodeStack::explore_action(ModelAction *act,
enabled_type_t
* is_enabled)
{
DBG();
{
DBG();
@@
-418,6
+426,8
@@
void NodeStack::pop_restofstack(int numAhead)
{
/* Diverging from previous execution; clear out remainder of list */
unsigned int it=iter+numAhead;
{
/* Diverging from previous execution; clear out remainder of list */
unsigned int it=iter+numAhead;
+ for(unsigned int i=it;i<node_list.size();i++)
+ delete node_list[i];
node_list.resize(it);
}
node_list.resize(it);
}