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 06dae19732e46d00b34865a4c8e9d9a9859f8704..bd1de3e60645f15e299e545b07d197b5c90d4e43 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -2,12 +2,12 @@
 #include <unistd.h>
 #include <cstring>
 #include <inttypes.h>
-#include <vector>
 
 #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) */
@@ -15,8 +15,8 @@
 #define MYLIBRARYNAME "libmodel.so"
 #define MAPFILE "/proc/self/maps"
 
-struct stackEntry {
-       stackEntry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
+struct snapshot_entry {
+       snapshot_entry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
        snapshot_id snapshotid;
        int index;
        MEMALLOC
@@ -24,17 +24,15 @@ struct stackEntry {
 
 class SnapshotStack {
  public:
-       SnapshotStack();
-       ~SnapshotStack();
        int backTrackBeforeStep(int seq_index);
        void snapshotStep(int seq_index);
 
        MEMALLOC
  private:
-       std::vector<struct stackEntry, ModelAlloc<struct stackEntry> > stack;
+       ModelVector<struct snapshot_entry> stack;
 };
 
-static SnapshotStack *snapshotObject;
+static SnapshotStack *snap_stack;
 
 #ifdef MAC
 /** The SnapshotGlobalSegments function computes the memory regions
@@ -127,15 +125,6 @@ static void SnapshotGlobalSegments()
 }
 #endif
 
-SnapshotStack::SnapshotStack() : stack()
-{
-       SnapshotGlobalSegments();
-}
-
-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.
@@ -159,20 +148,21 @@ int SnapshotStack::backTrackBeforeStep(int seqindex)
 /** This method takes a snapshot at the given sequence number. */
 void SnapshotStack::snapshotStep(int seqindex)
 {
-       stack.push_back(stackEntry(seqindex, take_snapshot()));
+       stack.push_back(snapshot_entry(take_snapshot(), seqindex));
 }
 
 void snapshot_stack_init()
 {
-       snapshotObject = new SnapshotStack();
+       snap_stack = new SnapshotStack();
+       SnapshotGlobalSegments();
 }
 
 void snapshot_record(int seq_index)
 {
-       snapshotObject->snapshotStep(seq_index);
+       snap_stack->snapshotStep(seq_index);
 }
 
 int snapshot_backtrack_before(int seq_index)
 {
-       return snapshotObject->backTrackBeforeStep(seq_index);
+       return snap_stack->backTrackBeforeStep(seq_index);
 }