diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2021-12-24 22:52:38 +0000 |
|---|---|---|
| committer | MartinNowack <2443641+MartinNowack@users.noreply.github.com> | 2022-03-17 11:33:50 +0000 |
| commit | e2d005ccdc3eea998d9598907743b19a39a1abe7 (patch) | |
| tree | 3998d13125d2837151ff49263ae70d5b4dc8f720 /lib/Support | |
| parent | 043f43fd03f06fbd332d16a24bb9f6b58ee66aef (diff) | |
| download | klee-e2d005ccdc3eea998d9598907743b19a39a1abe7.tar.gz | |
Fixed GetTotalMallocUsage on macOS to look at all zones. (The test MemoryLimit.h fails on macOS 12.1 without this fix.)
Diffstat (limited to 'lib/Support')
| -rw-r--r-- | lib/Support/MemoryUsage.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/lib/Support/MemoryUsage.cpp b/lib/Support/MemoryUsage.cpp index e2b4bbf7..00fe07b3 100644 --- a/lib/Support/MemoryUsage.cpp +++ b/lib/Support/MemoryUsage.cpp @@ -10,6 +10,7 @@ #include "klee/System/MemoryUsage.h" #include "klee/Config/config.h" +#include "klee/Support/ErrorHandling.h" #ifdef HAVE_GPERFTOOLS_MALLOC_EXTENSION_H #include "gperftools/malloc_extension.h" @@ -108,10 +109,22 @@ size_t util::GetTotalMallocUsage() { #elif defined(HAVE_MALLOC_ZONE_STATISTICS) - // Support memory usage on Darwin. - malloc_statistics_t Stats; - malloc_zone_statistics(malloc_default_zone(), &Stats); - return Stats.size_in_use; + // Memory usage on macOS + + malloc_statistics_t stats; + malloc_zone_t **zones; + unsigned int num_zones; + + if (malloc_get_all_zones(0, nullptr, (vm_address_t **)&zones, &num_zones) != + KERN_SUCCESS) + klee_error("malloc_get_all_zones failed."); + + int total = 0; + for (unsigned i = 0; i < num_zones; i++) { + malloc_zone_statistics(zones[i], &stats); + total += stats.size_in_use; + } + return total; #else // HAVE_MALLINFO |