X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=snapshot.cc;h=8bc685c57c146f6bd7767b2476e9d74f6b963ea5;hb=717ddd114a51764ac33d3d86d6eeb09c7c4aee1b;hp=e006189c44ba1741208183ea8cbddd222b381dfd;hpb=b5000a06086de6ea8799168d463f018cab785830;p=model-checker.git

diff --git a/snapshot.cc b/snapshot.cc
index e006189..8bc685c 100644
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -3,26 +3,21 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdlib.h>
-#include "hashtable.h"
-#include <cstring>
-#include <cstdio>
-#include "snapshot.h"
-#include "snapshotimp.h"
-#include "mymemory.h"
-#include <fcntl.h>
-#include <assert.h>
-#include <pthread.h>
-#include <semaphore.h>
+#include <string.h>
 #include <errno.h>
 #include <sys/wait.h>
 #include <ucontext.h>
 
+#include "hashtable.h"
+#include "snapshot.h"
+#include "snapshotimp.h"
+#include "mymemory.h"
 #include "common.h"
 
-#define FAILURE(mesg) { printf("failed in the API: %s with errno relative message: %s\n", mesg, strerror( errno ) ); exit(EXIT_FAILURE); }
+#define FAILURE(mesg) { model_print("failed in the API: %s with errno relative message: %s\n", mesg, strerror( errno ) ); exit(EXIT_FAILURE); }
 
 #ifdef CONFIG_SSDEBUG
-#define SSDEBUG		printf
+#define SSDEBUG		model_print
 #else
 #define SSDEBUG(...)	do { } while (0)
 #endif
@@ -86,15 +81,17 @@ static void initSnapShotRecord(unsigned int numbackingpages, unsigned int numsna
  */
 static void HandlePF( int sig, siginfo_t *si, void * unused){
 	if( si->si_code == SEGV_MAPERR ){
-		printf("Real Fault at %p\n", si->si_addr);
+		model_print("Real Fault at %p\n", si->si_addr);
 		print_trace();
+		model_print("For debugging, place breakpoint at: %s:%d\n",
+				__FILE__, __LINE__);
 		exit( EXIT_FAILURE );
 	}
 	void* addr = ReturnPageAlignedAddress(si->si_addr);
 
 	unsigned int backingpage=snapshotrecord->lastBackingPage++; //Could run out of pages...
 	if (backingpage==snapshotrecord->maxBackingPages) {
-		printf("Out of backing pages at %p\n", si->si_addr);
+		model_print("Out of backing pages at %p\n", si->si_addr);
 		exit( EXIT_FAILURE );
 	}
 
@@ -149,12 +146,12 @@ void initSnapshotLibrary(unsigned int numbackingpages,
 	sa.sa_sigaction = HandlePF;
 #ifdef MAC
 	if( sigaction( SIGBUS, &sa, NULL ) == -1 ){
-		printf("SIGACTION CANNOT BE INSTALLED\n");
+		model_print("SIGACTION CANNOT BE INSTALLED\n");
 		exit(EXIT_FAILURE);
 	}
 #endif
 	if( sigaction( SIGSEGV, &sa, NULL ) == -1 ){
-		printf("SIGACTION CANNOT BE INSTALLED\n");
+		model_print("SIGACTION CANNOT BE INSTALLED\n");
 		exit(EXIT_FAILURE);
 	}
 
@@ -249,7 +246,7 @@ void addMemoryRegionToSnapShot( void * addr, unsigned int numPages) {
 #if USE_MPROTECT_SNAPSHOT
 	unsigned int memoryregion=snapshotrecord->lastRegion++;
 	if (memoryregion==snapshotrecord->maxRegions) {
-		printf("Exceeded supported number of memory regions!\n");
+		model_print("Exceeded supported number of memory regions!\n");
 		exit(EXIT_FAILURE);
 	}
 
@@ -266,13 +263,13 @@ snapshot_id takeSnapshot( ){
 	for(unsigned int region=0; region<snapshotrecord->lastRegion;region++) {
 		if( mprotect(snapshotrecord->regionsToSnapShot[region].basePtr, snapshotrecord->regionsToSnapShot[region].sizeInPages*sizeof(struct SnapShotPage), PROT_READ ) == -1 ){
 			perror("mprotect");
-			printf("Failed to mprotect inside of takeSnapShot\n");
+			model_print("Failed to mprotect inside of takeSnapShot\n");
 			exit(EXIT_FAILURE);
 		}
 	}
 	unsigned int snapshot=snapshotrecord->lastSnapShot++;
 	if (snapshot==snapshotrecord->maxSnapShots) {
-		printf("Out of snapshots\n");
+		model_print("Out of snapshots\n");
 		exit(EXIT_FAILURE);
 	}
 	snapshotrecord->snapShots[snapshot].firstBackingPage=snapshotrecord->lastBackingPage;
@@ -303,7 +300,7 @@ void rollBack( snapshot_id theID ){
 	for(unsigned int region=0; region<snapshotrecord->lastRegion;region++) {
 		if( mprotect(snapshotrecord->regionsToSnapShot[region].basePtr, snapshotrecord->regionsToSnapShot[region].sizeInPages*sizeof(struct SnapShotPage), PROT_READ | PROT_WRITE ) == -1 ){
 			perror("mprotect");
-			printf("Failed to mprotect inside of takeSnapShot\n");
+			model_print("Failed to mprotect inside of takeSnapShot\n");
 			exit(EXIT_FAILURE);
 		}
 	}