X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=snapshot-interface.cc;h=51fe2f08de1392dd6fe40cd3757edcf675367c60;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=cece58d0d10240c813b1be515ddc1e33825a7a47;hpb=18fb657b0c6f8abfe4048e5252a9ffab960acabc;p=model-checker.git

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index cece58d..51fe2f0 100644
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -3,7 +3,6 @@
 #include <iostream>
 #include <fstream>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sstream>
 #include <cstring>
 #include <string>
@@ -13,15 +12,20 @@
 #include <inttypes.h>
 #include "common.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_FORMAT "/proc/%d/maps"
+#define MAPFILE "/proc/self/maps"
 
 SnapshotStack * snapshotObject;
 
 #ifdef MAC
-void SnapshotGlobalSegments(){
+/** The SnapshotGlobalSegments function computes the memory regions
+ *	that may contain globals and then configures the snapshotting
+ *	library to snapshot them.
+ */
+static void SnapshotGlobalSegments(){
 	int pid = getpid();
 	char buf[9000], execname[100];
 	FILE *map;
@@ -52,51 +56,59 @@ void SnapshotGlobalSegments(){
 		//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 [%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))) {
-			printf("%s\n", buf);
-		
 			size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
 			if (len != 0)
 				addMemoryRegionToSnapShot(begin, len);
-			DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
 		}
 	}
 	pclose(map);
 }
 #else
-void SnapshotGlobalSegments(){
-	int pid = getpid();
-	char buf[9000], filename[100];
+
+static void get_binary_name(char *buf, size_t len)
+{
+	if (readlink("/proc/self/exe", buf, len) == -1) {
+		perror("readlink");
+		exit(EXIT_FAILURE);
+	}
+}
+
+/** The SnapshotGlobalSegments function computes the memory regions
+ *	that may contain globals and then configures the snapshotting
+ *	library to snapshot them.
+ */
+static void SnapshotGlobalSegments(){
+	char buf[9000];
+	char binary_name[800];
 	FILE *map;
 
-	sprintf(filename, MAPFILE_FORMAT, pid);
-	map = fopen(filename, "r");
+	map = fopen(MAPFILE, "r");
 	if (!map) {
 		perror("fopen");
 		exit(EXIT_FAILURE);
 	}
+	get_binary_name(binary_name, sizeof(binary_name));
 	while (fgets(buf, sizeof(buf), map)) {
 		char regionname[200] = "";
 		char r, w, x, p;
 		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, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
+		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);
-			DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
+			DEBUG("%55s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
 		}
 	}
 	fclose(map);
 }
 #endif
 
-//class definition of SnapshotStack.....
-//declaration of constructor....
 SnapshotStack::SnapshotStack(){
 	SnapshotGlobalSegments();
 	stack=NULL;
@@ -105,6 +117,13 @@ SnapshotStack::SnapshotStack(){
 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) {
@@ -113,13 +132,14 @@ int SnapshotStack::backTrackBeforeStep(int seqindex) {
 			return stack->index;
 		}
 		struct stackEntry *tmp=stack;
-		MYFREE(tmp);
 		stack=stack->next;
+		model_free(tmp);
 	}
 }
 
+/** This method takes a snapshot at the given sequence number. */
 void SnapshotStack::snapshotStep(int seqindex) {
-	struct stackEntry *tmp=(struct stackEntry *)MYMALLOC(sizeof(struct stackEntry));
+	struct stackEntry *tmp=(struct stackEntry *)model_malloc(sizeof(struct stackEntry));
 	tmp->next=stack;
 	tmp->index=seqindex;
 	tmp->snapshotid=takeSnapshot();