rename MYCALLOC -> model_calloc

diff --git a/cyclegraph.cc b/cyclegraph.cc
index ae80fcf8fda2b4b2d8f04dcc9cbc13a40ef72359..0a58e5823199a3168440e2b90b4b8b6d24cb6c9c 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -170,7 +170,7 @@ bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to)
  */
 bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
        std::vector<CycleNode *, MyAlloc<CycleNode *> > queue;
-       HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, MYCALLOC, MYFREE> discovered;
+       HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, MYFREE> discovered;
 
        queue.push_back(from);
        discovered.put(from, from);

diff --git a/mymemory.cc b/mymemory.cc
index 4b393cb4a29fac98fdb7b912fef5991d7a7c458a..9fbca0391199ba6e2608bacb065d28a7a826c3c8 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -14,7 +14,7 @@ static mspace sStaticSpace = NULL;
 #endif
 
 /** Non-snapshotting calloc for our use. */
-void *MYCALLOC(size_t count, size_t size) {
+void *model_calloc(size_t count, size_t size) {
 #if USE_MPROTECT_SNAPSHOT
        static void *(*callocp)(size_t count, size_t size)=NULL;
        char *error;

diff --git a/mymemory.h b/mymemory.h
index 21f636f584f7c6b66cbc534ef3708c2fe2f667f3..a6a3c59320731d539860f4ca284a399f0cae7100 100644 (file)
--- a/mymemory.h
+++ b/mymemory.h
@@ -28,7 +28,7 @@
 #define SNAPSHOTALLOC
 
 void *model_malloc(size_t size);
-void *MYCALLOC(size_t count, size_t size);
+void *model_calloc(size_t count, size_t size);
 void MYFREE(void *ptr);
 
 static inline void * snapshot_malloc(size_t size) {

diff --git a/snapshot.cc b/snapshot.cc
index 642885b038df274b68eb028e7a25d5563b9f2ec6..2c7d84193e1feb21443696335603b951491be9af 100644 (file)
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -284,7 +284,7 @@ snapshot_id takeSnapshot( ){
  */
 void rollBack( snapshot_id theID ){
 #if USE_MPROTECT_SNAPSHOT
-       HashTable< void *, bool, uintptr_t, 4, model_malloc, MYCALLOC, MYFREE> duplicateMap;
+       HashTable< void *, bool, uintptr_t, 4, model_malloc, model_calloc, MYFREE> duplicateMap;
        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");