diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2017-04-25 17:49:15 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@linux.vnet.ibm.com> | 2017-11-21 14:35:47 +1100 |
| commit | 3188131b15c26509e4df3c4b15972d07a20be8bd (patch) | |
| tree | 1ccfc16164fd3562f851060ae1adfe127c8308a1 /sql/sql_cache.cc | |
| parent | c029eae02d5d94a52add7cd546a6b92a78d672b0 (diff) | |
| download | mariadb-git-3188131b15c26509e4df3c4b15972d07a20be8bd.tar.gz | |
MDEV-10814: Coredumps to exclude query cache (Linux)
This only occurs non-DEBUG builds. Its main purpose is to
save space in the core dump from elements not usually useful.
Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 2dc977c9b5d..6306441e4b4 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -329,6 +329,9 @@ TODO list: */ #include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#if defined(DBUG_OFF) && defined(HAVE_MADVISE) +#include <sys/mman.h> +#endif #include "sql_priv.h" #include "sql_basic_types.h" #include "sql_cache.h" @@ -2581,7 +2584,7 @@ ulong Query_cache::init_cache() { uint mem_bin_count, num, step; ulong mem_bin_size, prev_size, inc; - ulong additional_data_size, max_mem_bin_size, approx_additional_data_size; + ulong max_mem_bin_size, approx_additional_data_size; int align; DBUG_ENTER("Query_cache::init_cache"); @@ -2646,6 +2649,13 @@ ulong Query_cache::init_cache() if (!(cache= (uchar *) my_malloc_lock(query_cache_size+additional_data_size, MYF(0)))) goto err; +#if defined(DBUG_OFF) && defined(HAVE_MADVISE) && defined(MADV_DONTDUMP) + if (madvise(cache, query_cache_size+additional_data_size, MADV_DONTDUMP)) + { + DBUG_PRINT("warning", ("coudn't mark query cache memory as MADV_DONTDUMP: %s", + strerror(errno))); + } +#endif DBUG_PRINT("qcache", ("cache length %lu, min unit %lu, %u bins", query_cache_size, min_allocation_unit, mem_bin_num)); @@ -2797,6 +2807,13 @@ void Query_cache::free_cache() } while (block != queries_blocks); } +#if defined(DBUG_OFF) && defined(HAVE_MADVISE) && defined(MADV_DODUMP) + if (madvise(cache, query_cache_size+additional_data_size, MADV_DODUMP)) + { + DBUG_PRINT("warning", ("coudn't mark query cache memory as MADV_DODUMP: %s", + strerror(errno))); + } +#endif my_free(cache); make_disabled(); my_hash_free(&queries); |