From a2b1ce7713d29dd465afc54660781aa04dc7db59 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Fri, 25 May 2012 16:13:02 -0700
Subject: [PATCH] more allocation fixes (use snapshotting)
---
model.cc | 2 +-
threads.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
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)
--
2.34.1