X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=snapshot-interface.cc;h=c8afa8f9465483ab169c644d3b8cec5c86b08a21;hb=05d91de8ac8098425d51e9af2704eb91e04a7f9b;hp=47fafa5b0641f8865cb279c47f08531e9cbfd4f1;hpb=fbcb205af54b85aed7d2d9a6ed1eaa91e7d70a23;p=model-checker.git

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 47fafa5..c8afa8f 100644
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -1,22 +1,17 @@
-#include "snapshot-interface.h"
-#include "snapshot.h"
-#include <iostream>
-#include <fstream>
+#include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.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_FORMAT "/proc/%d/maps"
+#define MAPFILE "/proc/self/maps"
 
 SnapshotStack * snapshotObject;
 
@@ -68,28 +63,37 @@ 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(){
-	int pid = getpid();
-	char buf[9000], filename[100];
+	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);