impatomic: add multiple-inclusion guards

[model-checker.git] / snapshot-interface.cc

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index c88e65ae5a5d4a0b35a9bbd9eebd5b0744442bfb..47fafa5b0641f8865cb279c47f08531e9cbfd4f1 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -25,8 +25,7 @@ SnapshotStack * snapshotObject;
  *     that may contain globals and then configures the snapshotting
  *     library to snapshot them.
  */
-
-void SnapshotGlobalSegments(){
+static void SnapshotGlobalSegments(){
        int pid = getpid();
        char buf[9000], execname[100];
        FILE *map;
@@ -57,15 +56,13 @@ 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))) {
                        size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
                        if (len != 0)
                                addMemoryRegionToSnapShot(begin, len);
-                       DEBUG("%s\n", buf);
-                       DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
                }
        }
        pclose(map);
@@ -75,7 +72,7 @@ void SnapshotGlobalSegments(){
  *     that may contain globals and then configures the snapshotting
  *     library to snapshot them.
  */
-void SnapshotGlobalSegments(){
+static void SnapshotGlobalSegments(){
        int pid = getpid();
        char buf[9000], filename[100];
        FILE *map;
@@ -96,7 +93,7 @@ void SnapshotGlobalSegments(){
                        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);
@@ -114,11 +111,10 @@ 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.  
+ * 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) {
@@ -127,16 +123,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.
- */
-
+/** 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();