diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 13:39:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 13:39:28 +0300 |
| commit | 6729dd894cfcb86f97d218fb51c41a461cb2f38a (patch) | |
| tree | 62f5a32a006d3624f0088a4629aeef4f471c7c60 /sql/sql_test.cc | |
| parent | d2e2d32933823623fa3598c8e2b8a5a322e435bb (diff) | |
| parent | 8d472f2b783e4d67e07caa789ddcc8faf2b01650 (diff) | |
| download | mariadb-git-6729dd894cfcb86f97d218fb51c41a461cb2f38a.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index c10d869f9b2..5ea853ade0b 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -33,6 +33,8 @@ #include <malloc.h> #elif defined(HAVE_MALLINFO) && defined(HAVE_SYS_MALLOC_H) #include <sys/malloc.h> +#elif defined(HAVE_MALLOC_ZONE) +#include <malloc/malloc.h> #endif #ifdef HAVE_EVENT_SCHEDULER @@ -655,6 +657,20 @@ Memory allocated by threads: %s\n", llstr(tmp.global_memory_used, llbuff[8]), llstr(tmp.local_memory_used, llbuff[9])); +#elif defined(HAVE_MALLOC_ZONE) + malloc_statistics_t info; + char llbuff[4][22]; + + malloc_zone_statistics(nullptr, &info); + printf("\nMemory status:\n\ +Total allocated space: %s\n\ +Total free space: %s\n\ +Global memory allocated by server: %s\n\ +Memory allocated by threads: %s\n", + llstr(info.size_allocated, llbuff[0]), + llstr((info.size_allocated - info.size_in_use), llbuff[1]), + llstr(tmp.global_memory_used, llbuff[2]), + llstr(tmp.local_memory_used, llbuff[3])); #endif #ifdef HAVE_EVENT_SCHEDULER |