X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=snapshot-interface.cc;h=bf12fe8ae77f60471327b8cd9ccc41a4521acb9a;hp=57ac52ee25ba541da665b1440c5ab0e7a7bead35;hb=67becf49b3c3cbc967a272dd92936812bd571fd4;hpb=64fa7349d52d41bde86c8e07ddc157a1e50a1384

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 57ac52ee..bf12fe8a 100644
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -2,17 +2,16 @@
 #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 snapshot_entry {
@@ -23,13 +22,13 @@ struct snapshot_entry {
 };
 
 class SnapshotStack {
- public:
+public:
 	int backTrackBeforeStep(int seq_index);
 	void snapshotStep(int seq_index);
 
 	MEMALLOC
- private:
-	std::vector<struct snapshot_entry, ModelAlloc<struct snapshot_entry> > stack;
+private:
+	ModelVector<struct snapshot_entry> stack;
 };
 
 static SnapshotStack *snap_stack;
@@ -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);
 
-		if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
+		char * secondpart = strstr(buf, "]");
+
+		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);
@@ -134,7 +141,7 @@ static void SnapshotGlobalSegments()
 int SnapshotStack::backTrackBeforeStep(int seqindex)
 {
 	int i;
-	for (i = (int)stack.size() - 1; i >= 0; i++)
+	for (i = (int)stack.size() - 1;i >= 0;i++)
 		if (stack[i].index <= seqindex)
 			break;
 		else