Fix bug when vectors of action lists get reallocated

diff --git a/actionlist.cc b/actionlist.cc
index 0dc8bc89661db7556d4fdc00344f8811d81be927..4a24ba9952a32bffbefdbdf418a031d6ac1db412 100644 (file)
--- a/actionlist.cc
+++ b/actionlist.cc
@@ -246,3 +246,16 @@ void actionlist::clear() {
 bool actionlist::isEmpty() {
        return root.count == 0;
 }
 bool actionlist::isEmpty() {
        return root.count == 0;
 }

+
+/**
+ * Fix the parent pointer of root when root address changes (possible
+ * due to vector<action_list_t> resize)
+ */
+void actionlist::fixupParent()
+{
+       for (int i = 0; i < ALLNODESIZE; i++) {
+               allnode * child = root.children[i];
+               if (child != NULL && child->parent != &root)
+                       child->parent = &root;
+       }
+}

diff --git a/actionlist.h b/actionlist.h
index 20f93fc953b9c27472df84c7de15cc53f66800e7..ee0a144590fb8fd6ed146c025eab2e10c8984409 100644 (file)
--- a/actionlist.h
+++ b/actionlist.h
@@ -41,6 +41,7 @@ public:
        uint size() {return _size;}
        sllnode<ModelAction *> * begin() {return head;}
        sllnode<ModelAction *> * end() {return tail;}
        uint size() {return _size;}
        sllnode<ModelAction *> * begin() {return head;}
        sllnode<ModelAction *> * end() {return tail;}

+       void fixupParent();

 
        SNAPSHOTALLOC;
 
 
        SNAPSHOTALLOC;
 

diff --git a/execution.cc b/execution.cc
index c37de41a1f14fb032c0ab85fe28064426cb943a1..7f7d31c110b2e6ce9d30c844a16c63703c31f2e6 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -118,6 +118,20 @@ static SnapVector<action_list_t> * get_safe_ptr_vect_action(HashTable<const void
        return tmp;
 }
 
        return tmp;
 }
 

+/**
+ * When vectors of action lists are reallocated due to resize, the root address of
+ * action lists may change. Hence we need to fix the parent pointer of the children
+ * of root.
+ */
+static void fixup_action_list (SnapVector<action_list_t> * vec)
+{
+       for (uint i = 0; i < vec->size(); i++) {
+               action_list_t * list = &(*vec)[i];
+               if (list != NULL)
+                       list->fixupParent();
+       }
+}
+

 /** @return a thread ID for a new Thread */
 thread_id_t ModelExecution::get_next_id()
 {
 /** @return a thread ID for a new Thread */
 thread_id_t ModelExecution::get_next_id()
 {


@@ -785,6 +799,8 @@ bool ModelExecution::r_modification_order(ModelAction *curr, const ModelAction *
                thrd_lists->resize(priv->next_thread_id);
                for(uint i = oldsize;i < priv->next_thread_id;i++)
                        new (&(*thrd_lists)[i]) action_list_t();
                thrd_lists->resize(priv->next_thread_id);
                for(uint i = oldsize;i < priv->next_thread_id;i++)
                        new (&(*thrd_lists)[i]) action_list_t();

+
+               fixup_action_list(thrd_lists);

        }
 
        ModelAction *prev_same_thread = NULL;
        }
 
        ModelAction *prev_same_thread = NULL;


@@ -1120,6 +1136,8 @@ void ModelExecution::add_action_to_lists(ModelAction *act, bool canprune)
                vec->resize(priv->next_thread_id);
                for(uint i = oldsize;i < priv->next_thread_id;i++)
                        new (&(*vec)[i]) action_list_t();
                vec->resize(priv->next_thread_id);
                for(uint i = oldsize;i < priv->next_thread_id;i++)
                        new (&(*vec)[i]) action_list_t();

+
+               fixup_action_list(vec);

        }
        if (!canprune && (act->is_read() || act->is_write()))
                (*vec)[tid].addAction(act);
        }
        if (!canprune && (act->is_read() || act->is_write()))
                (*vec)[tid].addAction(act);


@@ -1171,6 +1189,8 @@ void ModelExecution::add_normal_write_to_lists(ModelAction *act)
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                        new (&(*vec)[i]) action_list_t();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                        new (&(*vec)[i]) action_list_t();

+
+               fixup_action_list(vec);

        }
        insertIntoActionList(&(*vec)[tid],act);
 
        }
        insertIntoActionList(&(*vec)[tid],act);
 


@@ -1189,6 +1209,8 @@ void ModelExecution::add_write_to_lists(ModelAction *write) {
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                        new (&(*vec)[i]) action_list_t();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                        new (&(*vec)[i]) action_list_t();

+
+               fixup_action_list(vec);

        }
        (*vec)[tid].addAction(write);
 }
        }
        (*vec)[tid].addAction(write);
 }