diff --git a/src/util/memory_info.cpp b/src/util/memory_info.cpp index 5eb531a5509..c573cb3f5e7 100644 --- a/src/util/memory_info.cpp +++ b/src/util/memory_info.cpp @@ -45,21 +45,15 @@ void memory_info(std::ostream &out) out << " space available in freed fastbin blocks: " << m.fsmblks << "\n"; out << " total allocated space: " << m.uordblks << "\n"; out << " total free space: " << m.fordblks << "\n"; -#endif - -#ifdef _WIN32 - (void)out; // unused parameter -#if 0 +#elif defined(_WIN32) PROCESS_MEMORY_COUNTERS pmc; if(GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc))) { - out << " PeakWorkingSetSize: " << pmc.PeakWorkingSetSize << "\n"; - out << " WorkingSetSize: " << pmc.WorkingSetSize << "\n"; + out << " peak working set size [bytes]: " << pmc.PeakWorkingSetSize + << "\n"; + out << " current working set size [bytes]: " << pmc.WorkingSetSize << "\n"; } -#endif -#endif - -#ifdef __APPLE__ +#elif defined(__APPLE__) // NOLINTNEXTLINE(readability/identifiers) struct task_basic_info t_info; mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT; diff --git a/unit/Makefile b/unit/Makefile index 5b6e156ea2e..d24a82f5d90 100644 --- a/unit/Makefile +++ b/unit/Makefile @@ -49,6 +49,7 @@ SRC += analyses/ai/ai.cpp \ util/graph.cpp \ util/irep.cpp \ util/irep_sharing.cpp \ + util/memory_info.cpp \ util/message.cpp \ util/optional.cpp \ util/optional_utils.cpp \ diff --git a/unit/util/memory_info.cpp b/unit/util/memory_info.cpp new file mode 100644 index 00000000000..0b3cd067732 --- /dev/null +++ b/unit/util/memory_info.cpp @@ -0,0 +1,21 @@ +/*******************************************************************\ + +Module: Unit tests for memory_info.h + +Author: Michael Tautschnig + +\*******************************************************************/ + +#include + +#include + +#include + +TEST_CASE("memory_info returns some output", "[core][util][memory_info]") +{ + std::ostringstream oss; + memory_info(oss); + + REQUIRE(!oss.str().empty()); +}