if (action)
delete action;
if (enabled_array)
- MYFREE(enabled_array);
+ model_free(enabled_array);
}
/** Prints debugging info for the ModelAction associated with this Node */
* @return true if we have a valid combination.
*/
bool Node::increment_promise() {
+ DBG();
+
for (unsigned int i = 0; i < promises.size(); i++) {
if (promises[i] == PROMISE_UNFULFILLED) {
promises[i] = PROMISE_FULFILLED;
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;
}
}
* @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()));
}
/**
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 {
* @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() {
- ASSERT(future_index<future_values.size());
+ ASSERT(future_index<((int)future_values.size()));
return future_values[future_index].expiration;
}
* @return Returns false if we have explored all items.
*/
bool Node::increment_read_from() {
- read_from_index++;
- return (read_from_index < may_read_from.size());
+ DBG();
+ promises.clear();
+ if (read_from_index < may_read_from.size()) {
+ read_from_index++;
+ return read_from_index < may_read_from.size();
+ }
+ return false;
}
/**
* @return Returns false if we have explored all values.
*/
bool Node::increment_future_value() {
- future_index++;
- return (future_index < future_values.size());
+ DBG();
+ 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)