snapshot: don't export page-aligning functions

Declare these functions static and move them upward in the file.

diff --git a/snapshot.cc b/snapshot.cc
index bb599010f37f5c810ae6436ddd042850208d986c..99b9d7958753d49b77513e279ff40bd4196ad178 100644 (file)
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -38,8 +38,22 @@ static ucontext_t savedUserSnapshotContext;
 static snapshot_id snapshotid = 0;
 #endif
 
 static snapshot_id snapshotid = 0;
 #endif
 

+/** PageAlignedAdressUpdate return a page aligned address for the
+ * address being added as a side effect the numBytes are also changed.
+ */
+static void * PageAlignAddressUpward(void * addr) {
+       return (void *)((((uintptr_t)addr)+PAGESIZE-1)&~(PAGESIZE-1));
+}
+

 #if USE_MPROTECT_SNAPSHOT
 
 #if USE_MPROTECT_SNAPSHOT
 

+/** ReturnPageAlignedAddress returns a page aligned address for the
+ * address being added as a side effect the numBytes are also changed.
+ */
+static void * ReturnPageAlignedAddress(void * addr) {
+       return (void *)(((uintptr_t)addr)&~(PAGESIZE-1));
+}
+

 /** The initSnapShotRecord method initialized the snapshotting data
  *  structures for the mprotect based snapshot. 
  */
 /** The initSnapShotRecord method initialized the snapshotting data
  *  structures for the mprotect based snapshot. 
  */


@@ -90,21 +104,6 @@ void HandlePF( int sig, siginfo_t *si, void * unused){
 #endif //nothing to handle for non snapshotting case.
 }
 
 #endif //nothing to handle for non snapshotting case.
 }
 

-/** ReturnPageAlignedAddress returns a page aligned address for the
- * address being added as a side effect the numBytes are also changed.
- */
-
-void * ReturnPageAlignedAddress(void * addr) {
-       return (void *)(((uintptr_t)addr)&~(PAGESIZE-1));
-}
-
-/** PageAlignedAdressUpdate return a page aligned address for the
- * address being added as a side effect the numBytes are also changed.
- */
-
-void * PageAlignAddressUpward(void * addr) {
-       return (void *)((((uintptr_t)addr)+PAGESIZE-1)&~(PAGESIZE-1));
-}

 void createSharedLibrary(){
 #if !USE_MPROTECT_SNAPSHOT
        //step 1. create shared memory.
 void createSharedLibrary(){
 #if !USE_MPROTECT_SNAPSHOT
        //step 1. create shared memory.

diff --git a/snapshotimp.h b/snapshotimp.h
index 90bbc83352fc4b6697032929d1ab942fdd25a2fc..6b58ed7ed227256325e4b8ab237169d068d1a68b 100644 (file)
--- a/snapshotimp.h
+++ b/snapshotimp.h
@@ -55,8 +55,6 @@ struct SnapShot {
 
 //Global reference to snapshot data structure
 extern struct SnapShot * snapshotrecord;
 
 //Global reference to snapshot data structure
 extern struct SnapShot * snapshotrecord;

-void * ReturnPageAlignedAddress( void *);
-void * PageAlignAddressUpward( void *);

 #else
 struct Snapshot {
 char *mSharedMemoryBase;
 #else
 struct Snapshot {
 char *mSharedMemoryBase;