X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=snapshot-interface.cc;h=fdabcf33549349acb203ac201608461aa25d049c;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=06dae19732e46d00b34865a4c8e9d9a9859f8704;hpb=e300f8c076063b85d545e517972717758828d56e;p=model-checker.git

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 06dae19..fdabcf3 100644
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -2,21 +2,20 @@
 #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) */
 #define MYBINARYNAME "model"
-#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 +23,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
@@ -76,7 +73,7 @@ static void SnapshotGlobalSegments()
 
 		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);
 
-		if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
+		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);
@@ -88,10 +85,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
@@ -116,7 +119,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);
@@ -127,15 +130,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 +153,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);
 }