X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=snapshot-interface.cc;h=bf12fe8ae77f60471327b8cd9ccc41a4521acb9a;hp=c33b8d44549aa29de3d1dbdbb71bbf5f7628d8fd;hb=f9dade8fdfb62d62d14606268e3f7e5b692e15e6;hpb=260b391c9292c9eb48da1033bf4ac1c32ea49f87

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index c33b8d44..bf12fe8a 100644
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -7,32 +7,31 @@
 #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) */
 #define MYBINARYNAME "model"
-#define MYLIBRARYNAME "libmodel.so"
 #define MAPFILE "/proc/self/maps"
 
-struct stackEntry {
-	struct stackEntry *next;
+struct snapshot_entry {
+	snapshot_entry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
 	snapshot_id snapshotid;
 	int index;
+	MEMALLOC
 };
 
 class SnapshotStack {
- public:
-	SnapshotStack();
-	~SnapshotStack();
+public:
 	int backTrackBeforeStep(int seq_index);
 	void snapshotStep(int seq_index);
 
 	MEMALLOC
- private:
-	struct stackEntry *stack;
+private:
+	ModelVector<struct snapshot_entry> stack;
 };
 
-static SnapshotStack *snapshotObject;
+static SnapshotStack *snap_stack;
 
 #ifdef MAC
 /** The SnapshotGlobalSegments function computes the memory regions
@@ -65,16 +64,18 @@ static void SnapshotGlobalSegments()
 		char smstr[23];
 		char r, w, x;
 		char mr, mw, mx;
-		int size;
 		void *begin, *end;
 
 		//Skip out at the end of the section
 		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);
+		sscanf(buf, "%22s %p-%p", type, &begin, &end);
+
+		char * secondpart = strstr(buf, "]");
 
-		if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
+		sscanf(&secondpart[2], "%c%c%c/%c%c%c SM=%3s %200s\n", &r, &w, &x, &mr, &mw, &mx, smstr, regionname);
+		if (w == 'w' && strstr(regionname, MYBINARYNAME)) {
 			size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
 			if (len != 0)
 				snapshot_add_memory_region(begin, len);
@@ -86,10 +87,16 @@ static void SnapshotGlobalSegments()
 
 static void get_binary_name(char *buf, size_t len)
 {
-	if (readlink("/proc/self/exe", buf, len) == -1) {
+	ssize_t size = readlink("/proc/self/exe", buf, len);
+	if (size < 0) {
 		perror("readlink");
 		exit(EXIT_FAILURE);
 	}
+
+	/* Terminate string */
+	if ((size_t)size > len)
+		size = len;
+	buf[size] = '\0';
 }
 
 /** The SnapshotGlobalSegments function computes the memory regions
@@ -114,7 +121,7 @@ static void SnapshotGlobalSegments()
 		void *begin, *end;
 
 		sscanf(buf, "%p-%p %c%c%c%c %*x %*x:%*x %*u %200s\n", &begin, &end, &r, &w, &x, &p, regionname);
-		if (w == 'w' && (strstr(regionname, binary_name) || strstr(regionname, MYLIBRARYNAME))) {
+		if (w == 'w' && strstr(regionname, binary_name)) {
 			size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
 			if (len != 0)
 				snapshot_add_memory_region(begin, len);
@@ -125,16 +132,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.
@@ -143,40 +140,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()
 {
-	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);
 }