rename MYMALLOC -> model_malloc

[model-checker.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 378dd8f4eebf3a5636a6203edd4eb4f381252343..e59b99511b89d30d1d33ce1c81b2e5ec8f6ac4b1 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -121,6 +121,8 @@ bool Node::get_promise(unsigned int i) {
  * @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;
@@ -216,7 +218,7 @@ bool Node::read_from_empty() {
 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 {
@@ -321,6 +323,8 @@ const ModelAction * Node::get_read_from() {
  * @return Returns false if we have explored all items.
  */
 bool Node::increment_read_from() {
+       DBG();
+       promises.clear();
        read_from_index++;
        return (read_from_index < may_read_from.size());
 }
@@ -330,6 +334,8 @@ bool Node::increment_read_from() {
  * @return Returns false if we have explored all values.
  */
 bool Node::increment_future_value() {
+       DBG();
+       promises.clear();
        future_index++;
        return (future_index < future_values.size());
 }