X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=snapshot-interface.cc;h=974e436f7210acfdc1035208cb6f736a92d2c79d;hb=421c3af5d7265b26a4c946a710f2acd986c5d78a;hp=c22b8712b32937cbd415fb9f2ab7d1039e8c97a8;hpb=6f2d14687b0bc7063946d5dfca05cf47330eef4e;p=model-checker.git

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index c22b871..974e436 100644
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -1,18 +1,14 @@
-#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 "common.h"
 
+#include "snapshot-interface.h"
+#include "snapshot.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 "/proc/self/maps"
@@ -24,13 +20,14 @@ SnapshotStack * snapshotObject;
  *	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");
@@ -53,7 +50,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);
@@ -67,12 +64,23 @@ static void SnapshotGlobalSegments(){
 	pclose(map);
 }
 #else
+
+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(){
+static void SnapshotGlobalSegments()
+{
 	char buf[9000];
+	char binary_name[800];
 	FILE *map;
 
 	map = fopen(MAPFILE, "r");
@@ -80,13 +88,14 @@ static void SnapshotGlobalSegments(){
 		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);
@@ -97,12 +106,14 @@ static void SnapshotGlobalSegments(){
 }
 #endif
 
-SnapshotStack::SnapshotStack(){
+SnapshotStack::SnapshotStack()
+{
 	SnapshotGlobalSegments();
-	stack=NULL;
+	stack = NULL;
 }
 
-SnapshotStack::~SnapshotStack(){
+SnapshotStack::~SnapshotStack()
+{
 }
 
 
@@ -112,24 +123,26 @@ SnapshotStack::~SnapshotStack(){
  * @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) {
+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;
+		struct stackEntry *tmp = stack;
+		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 *)model_malloc(sizeof(struct stackEntry));
-	tmp->next=stack;
-	tmp->index=seqindex;
-	tmp->snapshotid=takeSnapshot();
-	stack=tmp;
+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;
 }