projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/git/model-checker
[model-checker.git]
/
nodestack.cc
diff --git
a/nodestack.cc
b/nodestack.cc
index 85bbf7169248f42e580f0ff2fc6373a4b723ba96..a73765320dac47e97428390fe37bc3b06ba10483 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
@@
-77,7
+78,7
@@
Node::~Node()
if (action)
delete action;
if (enabled_array)
if (action)
delete action;
if (enabled_array)
-
MYFREE
(enabled_array);
+
model_free
(enabled_array);
}
/** Prints debugging info for the ModelAction associated with this Node */
}
/** Prints debugging info for the ModelAction associated with this Node */
@@
-158,7
+159,7
@@
bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
if (future_values[i].value == value) {
if (future_values[i].expiration>=expiration)
return false;
if (future_values[i].value == value) {
if (future_values[i].expiration>=expiration)
return false;
- if (future_index <
i
) {
+ if (future_index <
((int) i)
) {
suitableindex=i;
}
}
suitableindex=i;
}
}
@@
-178,7
+179,7
@@
bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
* @return true if the future_values set is empty.
*/
bool Node::future_value_empty() {
* @return true if the future_values set is empty.
*/
bool Node::future_value_empty() {
- return ((future_index + 1) >=
future_values.size(
));
+ return ((future_index + 1) >=
((int)future_values.size()
));
}
/**
}
/**
@@
-218,7
+219,7
@@
bool Node::read_from_empty() {
void Node::explore_child(ModelAction *act, bool * is_enabled)
{
if ( ! enabled_array )
void Node::explore_child(ModelAction *act, bool * is_enabled)
{
if ( ! enabled_array )
- enabled_array=(bool *)
MYMALLOC
(sizeof(bool)*num_threads);
+ enabled_array=(bool *)
model_malloc
(sizeof(bool)*num_threads);
if (is_enabled != NULL)
memcpy(enabled_array, is_enabled, sizeof(bool)*num_threads);
else {
if (is_enabled != NULL)
memcpy(enabled_array, is_enabled, sizeof(bool)*num_threads);
else {
@@
-273,6
+274,11
@@
bool Node::is_enabled(thread_id_t tid)
return thread_id < num_threads && enabled_array[thread_id];
}
return thread_id < num_threads && enabled_array[thread_id];
}
+bool Node::has_priority(thread_id_t tid)
+{
+ return fairness[id_to_int(tid)].priority;
+}
+
/**
* Add an action to the may_read_from set.
* @param act is the action to add
/**
* Add an action to the may_read_from set.
* @param act is the action to add
@@
-288,12
+294,12
@@
void Node::add_read_from(const ModelAction *act)
* @return The first element in future_values
*/
uint64_t Node::get_future_value() {
* @return The first element in future_values
*/
uint64_t Node::get_future_value() {
- ASSERT(future_index<
future_values.size(
));
+ ASSERT(future_index<
((int)future_values.size()
));
return future_values[future_index].value;
}
modelclock_t Node::get_future_value_expiration() {
return future_values[future_index].value;
}
modelclock_t Node::get_future_value_expiration() {
- ASSERT(future_index<
future_values.size(
));
+ ASSERT(future_index<
((int)future_values.size()
));
return future_values[future_index].expiration;
}
return future_values[future_index].expiration;
}
@@
-324,9
+330,12
@@
const ModelAction * Node::get_read_from() {
*/
bool Node::increment_read_from() {
DBG();
*/
bool Node::increment_read_from() {
DBG();
-
- read_from_index++;
- return (read_from_index < may_read_from.size());
+ promises.clear();
+ if (read_from_index < may_read_from.size()) {
+ read_from_index++;
+ return read_from_index < may_read_from.size();
+ }
+ return false;
}
/**
}
/**
@@
-335,9
+344,12
@@
bool Node::increment_read_from() {
*/
bool Node::increment_future_value() {
DBG();
*/
bool Node::increment_future_value() {
DBG();
-
- future_index++;
- return (future_index < future_values.size());
+ promises.clear();
+ if (future_index < ((int)future_values.size())) {
+ future_index++;
+ return (future_index < ((int)future_values.size()));
+ }
+ return false;
}
void Node::explore(thread_id_t tid)
}
void Node::explore(thread_id_t tid)
@@
-412,6
+424,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);
}