about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorMartin Nowack <martin@se.inf.tu-dresden.de>2014-04-24 13:58:03 +0200
committerMartin Nowack <martin@se.inf.tu-dresden.de>2014-04-24 13:58:03 +0200
commit016120fd8a8a2cac8457b66b6d2a41e0b5093889 (patch)
treeef75ff1c67049e36d01bd5c798415ccef5257e5e
parente2799703b08cc1feb8a324bfb04edfeb2c296e57 (diff)
downloadklee-016120fd8a8a2cac8457b66b6d2a41e0b5093889.tar.gz
Renamed GetTotalMemoryUsage to GetTotalMallocUsage
-rw-r--r--include/klee/Internal/System/MemoryUsage.h2
-rw-r--r--lib/Core/Executor.cpp2
-rw-r--r--lib/Support/MemoryUsage.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/klee/Internal/System/MemoryUsage.h b/include/klee/Internal/System/MemoryUsage.h
index 37c838fc..e8e5d769 100644
--- a/include/klee/Internal/System/MemoryUsage.h
+++ b/include/klee/Internal/System/MemoryUsage.h
@@ -14,7 +14,7 @@
 
 namespace klee {
   namespace util {
-    size_t GetTotalMemoryUsage();
+    size_t GetTotalMallocUsage();
   }
 }
 
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index c0baa88c..abb023eb 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -2585,7 +2585,7 @@ void Executor::run(ExecutionState &initialState) {
         // We need to avoid calling GetMallocUsage() often because it
         // is O(elts on freelist). This is really bad since we start
         // to pummel the freelist once we hit the memory cap.
-        unsigned mbs = util::GetTotalMemoryUsage() >> 20;
+        unsigned mbs = util::GetTotalMallocUsage() >> 20;
         if (mbs > MaxMemory) {
           if (mbs > MaxMemory + 100) {
             // just guess at how many to kill
diff --git a/lib/Support/MemoryUsage.cpp b/lib/Support/MemoryUsage.cpp
index 94cee79e..676ce307 100644
--- a/lib/Support/MemoryUsage.cpp
+++ b/lib/Support/MemoryUsage.cpp
@@ -12,7 +12,7 @@
 
 using namespace klee;
 
-size_t util::GetTotalMemoryUsage() {
+size_t util::GetTotalMallocUsage() {
   struct mallinfo mi = ::mallinfo();
   // The malloc implementation in glibc (pmalloc2)
   // does not include mmap()'ed memory in mi.uordblks