From 7f9bbee401eb5c04bd0a050c0daf19813e81a783 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 1 Oct 2012 18:17:26 -0700
Subject: [PATCH] rename MYCALLOC -> model_calloc

---
 cyclegraph.cc | 2 +-
 mymemory.cc   | 2 +-
 mymemory.h    | 2 +-
 snapshot.cc   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cyclegraph.cc b/cyclegraph.cc
index ae80fcf8..0a58e582 100644
--- 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 4b393cb4..9fbca039 100644
--- 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 21f636f5..a6a3c593 100644
--- 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 642885b0..2c7d8419 100644
--- 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");
-- 
2.34.1