bugfix - add stl-model.h wrappers, to provide more control over STL

[c11tester.git] / snapshot-interface.cc

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 82f3e1300b253dfaa06ea8988a19640ae9eaffa2..bd1de3e60645f15e299e545b07d197b5c90d4e43 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -6,6 +6,8 @@
 #include "snapshot-interface.h"
 #include "snapshot.h"
 #include "common.h"
+#include "mymemory.h"
+#include "stl-model.h"
 
 /* MYBINARYNAME only works because our pathname usually includes 'model' (e.g.,
  * /.../model-checker/test/userprog.o) */
@@ -13,7 +15,24 @@
 #define MYLIBRARYNAME "libmodel.so"
 #define MAPFILE "/proc/self/maps"
 
-SnapshotStack *snapshotObject;
+struct snapshot_entry {
+       snapshot_entry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
+       snapshot_id snapshotid;
+       int index;
+       MEMALLOC
+};
+
+class SnapshotStack {
+ public:
+       int backTrackBeforeStep(int seq_index);
+       void snapshotStep(int seq_index);
+
+       MEMALLOC
+ private:
+       ModelVector<struct snapshot_entry> stack;
+};
+
+static SnapshotStack *snap_stack;
 
 #ifdef MAC
 /** The SnapshotGlobalSegments function computes the memory regions
@@ -106,16 +125,6 @@ static void SnapshotGlobalSegments()
 }
 #endif
 
-SnapshotStack::SnapshotStack()
-{
-       SnapshotGlobalSegments();
-       stack = NULL;
-}
-
-SnapshotStack::~SnapshotStack()
-{
-}
-
 /** This method returns to the last snapshot before the inputted
  * sequence number.  This function must be called from the model
  * checking thread and not from a snapshotted stack.
@@ -124,24 +133,36 @@ SnapshotStack::~SnapshotStack()
  */
 int SnapshotStack::backTrackBeforeStep(int seqindex)
 {
-       while (true) {
-               if (stack->index <= seqindex) {
-                       //have right entry
-                       snapshot_roll_back(stack->snapshotid);
-                       return stack->index;
-               }
-               struct stackEntry *tmp = stack;
-               stack = stack->next;
-               model_free(tmp);
-       }
+       int i;
+       for (i = (int)stack.size() - 1; i >= 0; i++)
+               if (stack[i].index <= seqindex)
+                       break;
+               else
+                       stack.pop_back();
+
+       ASSERT(i >= 0);
+       snapshot_roll_back(stack[i].snapshotid);
+       return stack[i].index;
 }
 
 /** This method takes a snapshot at the given sequence number. */
 void SnapshotStack::snapshotStep(int seqindex)
 {
-       struct stackEntry *tmp = (struct stackEntry *)model_malloc(sizeof(struct stackEntry));
-       tmp->next = stack;
-       tmp->index = seqindex;
-       tmp->snapshotid = take_snapshot();
-       stack = tmp;
+       stack.push_back(snapshot_entry(take_snapshot(), seqindex));
+}
+
+void snapshot_stack_init()
+{
+       snap_stack = new SnapshotStack();
+       SnapshotGlobalSegments();
+}
+
+void snapshot_record(int seq_index)
+{
+       snap_stack->snapshotStep(seq_index);
+}
+
+int snapshot_backtrack_before(int seq_index)
+{
+       return snap_stack->backTrackBeforeStep(seq_index);
 }