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 51fe2f08de1392dd6fe40cd3757edcf675367c60..bd1de3e60645f15e299e545b07d197b5c90d4e43 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -1,16 +1,13 @@
-#include "snapshot-interface.h"
-#include "snapshot.h"
-#include <iostream>
-#include <fstream>
+#include <stdlib.h>
 #include <unistd.h>
-#include <sstream>
 #include <cstring>
-#include <string>
-#include <cassert>
-#include <vector>
-#include <utility>
 #include <inttypes.h>
+
+#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) */
@@ -18,20 +15,38 @@
 #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
  *     that may contain globals and then configures the snapshotting
  *     library to snapshot them.
  */
-static void SnapshotGlobalSegments(){
+static void SnapshotGlobalSegments()
+{
        int pid = getpid();
        char buf[9000], execname[100];
        FILE *map;
 
        sprintf(execname, "vmmap -interleaved %d", pid);
-       map=popen(execname, "r");
+       map = popen(execname, "r");
 
        if (!map) {
                perror("popen");
@@ -54,7 +69,7 @@ static void SnapshotGlobalSegments(){
                void *begin, *end;
 
                //Skip out at the end of the section
-               if (buf[0]=='\n')
+               if (buf[0] == '\n')
                        break;
 
                sscanf(buf, "%22s %p-%p [%5dK] %c%c%c/%c%c%c SM=%3s %200s\n", type, &begin, &end, &size, &r, &w, &x, &mr, &mw, &mx, smstr, regionname);
@@ -62,7 +77,7 @@ static void SnapshotGlobalSegments(){
                if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
                        size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
                        if (len != 0)
-                               addMemoryRegionToSnapShot(begin, len);
+                               snapshot_add_memory_region(begin, len);
                }
        }
        pclose(map);
@@ -81,7 +96,8 @@ static void get_binary_name(char *buf, size_t len)
  *     that may contain globals and then configures the snapshotting
  *     library to snapshot them.
  */
-static void SnapshotGlobalSegments(){
+static void SnapshotGlobalSegments()
+{
        char buf[9000];
        char binary_name[800];
        FILE *map;
@@ -101,7 +117,7 @@ static void SnapshotGlobalSegments(){
                if (w == 'w' && (strstr(regionname, binary_name) || strstr(regionname, MYLIBRARYNAME))) {
                        size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
                        if (len != 0)
-                               addMemoryRegionToSnapShot(begin, len);
+                               snapshot_add_memory_region(begin, len);
                        DEBUG("%55s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
                }
        }
@@ -109,39 +125,44 @@ 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.
  * @param seqindex is the sequence number to rollback before.
  * @return is the sequence number we actually rolled back to.
  */
-int SnapshotStack::backTrackBeforeStep(int seqindex) {
-       while(true) {
-               if (stack->index<=seqindex) {
-                       //have right entry
-                       rollBack(stack->snapshotid);
-                       return stack->index;
-               }
-               struct stackEntry *tmp=stack;
-               stack=stack->next;
-               model_free(tmp);
-       }
+int SnapshotStack::backTrackBeforeStep(int seqindex)
+{
+       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=takeSnapshot();
-       stack=tmp;
+void SnapshotStack::snapshotStep(int seqindex)
+{
+       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);
 }