snapshot: more renaming

addMemoryRegionToSnapShot -> snapshot_add_memory_region
rollBack                  -> snapshot_roll_back
takeSnapshot              -> take_snapshot

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 974e436f7210acfdc1035208cb6f736a92d2c79d..a627dab55453488d547980860e808dbd95cbafc1 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -58,7 +58,7 @@ static void SnapshotGlobalSegments()
                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);
+                               snapshot_add_memory_region(begin, len);
                }
        }
        pclose(map);
@@ -98,7 +98,7 @@ static void SnapshotGlobalSegments()
                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);
+                               snapshot_add_memory_region(begin, len);
                        DEBUG("%55s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
                }
        }
@@ -128,7 +128,7 @@ int SnapshotStack::backTrackBeforeStep(int seqindex)
        while (true) {
                if (stack->index <= seqindex) {
                        //have right entry
-                       rollBack(stack->snapshotid);
+                       snapshot_roll_back(stack->snapshotid);
                        return stack->index;
                }
                struct stackEntry *tmp = stack;
@@ -143,6 +143,6 @@ void SnapshotStack::snapshotStep(int seqindex)
        struct stackEntry *tmp = (struct stackEntry *)model_malloc(sizeof(struct stackEntry));
        tmp->next = stack;
        tmp->index = seqindex;
-       tmp->snapshotid = takeSnapshot();
+       tmp->snapshotid = take_snapshot();
        stack = tmp;
 }

diff --git a/snapshot.cc b/snapshot.cc
index 6d6b45070b7c611699d9d14b0b620468ee173668..16b0b616e3ebca00a453d8d0903ddcb2e2838711 100644 (file)
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -174,12 +174,12 @@ static void mprot_snapshot_init(unsigned int numbackingpages,
        void *basemySpace = model_malloc((numheappages + 1) * PAGESIZE);
        void *pagealignedbase = PageAlignAddressUpward(basemySpace);
        user_snapshot_space = create_mspace_with_base(pagealignedbase, numheappages * PAGESIZE, 1);
-       addMemoryRegionToSnapShot(pagealignedbase, numheappages);
+       snapshot_add_memory_region(pagealignedbase, numheappages);
 
        void *base_model_snapshot_space = model_malloc((numheappages + 1) * PAGESIZE);
        pagealignedbase = PageAlignAddressUpward(base_model_snapshot_space);
        model_snapshot_space = create_mspace_with_base(pagealignedbase, numheappages * PAGESIZE, 1);
-       addMemoryRegionToSnapShot(pagealignedbase, numheappages);
+       snapshot_add_memory_region(pagealignedbase, numheappages);
 
        entryPoint();
 }
@@ -412,8 +412,8 @@ void initSnapshotLibrary(unsigned int numbackingpages,
 #endif
 }
 
-/** The addMemoryRegionToSnapShot function assumes that addr is page aligned. */
-void addMemoryRegionToSnapShot(void *addr, unsigned int numPages)
+/** Assumes that addr is page aligned. */
+void snapshot_add_memory_region(void *addr, unsigned int numPages)
 {
 #if USE_MPROTECT_SNAPSHOT
        mprot_add_to_snapshot(addr, numPages);
@@ -422,10 +422,10 @@ void addMemoryRegionToSnapShot(void *addr, unsigned int numPages)
 #endif
 }
 
-/** The takeSnapshot function takes a snapshot.
+/** Takes a snapshot of memory.
  * @return The snapshot identifier.
  */
-snapshot_id takeSnapshot()
+snapshot_id take_snapshot()
 {
 #if USE_MPROTECT_SNAPSHOT
        return mprot_take_snapshot();
@@ -434,10 +434,10 @@ snapshot_id takeSnapshot()
 #endif
 }
 
-/** The rollBack function rollback to the given snapshot identifier.
+/** Rolls the memory state back to the given snapshot identifier.
  *  @param theID is the snapshot identifier to rollback to.
  */
-void rollBack(snapshot_id theID)
+void snapshot_roll_back(snapshot_id theID)
 {
 #if USE_MPROTECT_SNAPSHOT
        mprot_roll_back(theID);

diff --git a/snapshot.h b/snapshot.h
index 8d37934b81be0504caa7ed7f8b93df4addc24c23..d3fc7b80f9856e5c83a662ba1235c72a6f1b18f4 100644 (file)
--- a/snapshot.h
+++ b/snapshot.h
@@ -9,9 +9,9 @@
 #include "config.h"
 #include "mymemory.h"
 
-void addMemoryRegionToSnapShot(void *ptr, unsigned int numPages);
-snapshot_id takeSnapshot();
-void rollBack(snapshot_id theSnapShot);
+void snapshot_add_memory_region(void *ptr, unsigned int numPages);
+snapshot_id take_snapshot();
+void snapshot_roll_back(snapshot_id theSnapShot);
 
 #if !USE_MPROTECT_SNAPSHOT
 mspace create_shared_mspace();