From: Brian Norris <banorris@uci.edu>
Date: Fri, 25 May 2012 23:13:02 +0000 (-0700)
Subject: more allocation fixes (use snapshotting)
X-Git-Tag: pldi2013~392^2~41
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=a2b1ce7713d29dd465afc54660781aa04dc7db59

more allocation fixes (use snapshotting)
---

diff --git a/model.cc b/model.cc
index 28880dd..62be087 100644
--- a/model.cc
+++ b/model.cc
@@ -31,7 +31,7 @@ ModelChecker::ModelChecker()
 
 ModelChecker::~ModelChecker()
 {
-	std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
+	std::map<int, class Thread *>::iterator it;
 	for (it = thread_map.begin(); it != thread_map.end(); it++)
 		delete (*it).second;
 	thread_map.clear();
diff --git a/threads.cc b/threads.cc
index d00e212..bdeea6a 100644
--- a/threads.cc
+++ b/threads.cc
@@ -9,12 +9,12 @@
 
 static void * stack_allocate(size_t size)
 {
-	return userMalloc(size);
+	return MYMALLOC(size);
 }
 
 static void stack_free(void *stack)
 {
-	userFree(stack);
+	MYFREE(stack);
 }
 
 Thread * thread_current(void)