-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WL#14633: Add support for jemalloc on Windows
Use jemalloc.dll (if present) for my_malloc in my_sys.lib and for ut::malloc etc in innobase.lib via function pointers. The function pointers are initialized to std::malloc, std::free etc so if jemalloc.dll is not present, the standard memory management functions are used. The use of the jemalloc functions is rendered "off by default" by the presence of a use_jemalloc_allocations function in mysys.lib that returns false. Clients of mysys.lib and innobase.lib wishing to use jemalloc (currently only the MySQL server executable and unit tests) enable it by providing an "overriding" definition of the use_jemalloc_allocations function that returns true. RB: 26872 Change-Id: If2e12d2e8504cb63c6ea0147832e2bb07ed13cb4
- Loading branch information
Daniel Blanchard
committed
Jan 13, 2022
1 parent
e1dd314
commit eb03fad
Showing
12 changed files
with
471 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/***************************************************************************** | ||
Copyright (c) 2021, Oracle and/or its affiliates. | ||
This program is free software; you can redistribute it and/or modify it under | ||
the terms of the GNU General Public License, version 2.0, as published by the | ||
Free Software Foundation. | ||
This program is also distributed with certain software (including but not | ||
limited to OpenSSL) that is licensed under separate terms, as designated in a | ||
particular file or component or in included license documentation. The authors | ||
of MySQL hereby grant you an additional permission to link the program and | ||
your derivative works with the separately licensed software that they have | ||
included with MySQL. | ||
This program is distributed in the hope that it will be useful, but WITHOUT | ||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0, | ||
for more details. | ||
You should have received a copy of the GNU General Public License along with | ||
this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
*****************************************************************************/ | ||
#ifndef JEMALLOC_WIN_INCLUDED | ||
#define JEMALLOC_WIN_INCLUDED | ||
|
||
/** @file jemalloc_win.h | ||
Details for dynamically loading and using jemalloc.dll on Windows */ | ||
|
||
#ifdef _WIN32 | ||
#include <mutex> | ||
#include <string> | ||
#include <vector> | ||
#include "my_loglevel.h" | ||
const constexpr char *jemalloc_dll_name = "jemalloc.dll"; | ||
const constexpr char *jemalloc_malloc_function_name = "je_malloc"; | ||
const constexpr char *jemalloc_calloc_function_name = "je_calloc"; | ||
const constexpr char *jemalloc_realloc_function_name = "je_realloc"; | ||
const constexpr char *jemalloc_free_function_name = "je_free"; | ||
|
||
namespace mysys { | ||
extern bool is_my_malloc_using_jemalloc(); | ||
struct LogMessageInfo { | ||
loglevel m_severity; | ||
int64_t m_ecode; | ||
std::string m_message; | ||
}; | ||
extern std::vector<LogMessageInfo> fetch_jemalloc_initialization_messages(); | ||
|
||
const int64_t MY_MALLOC_USING_JEMALLOC_ER = 0; | ||
const int64_t MY_MALLOC_USING_STD_MALLOC_ER = 1; | ||
const int64_t MY_MALLOC_LOADLIBRARY_FAILED_ER = 2; | ||
const int64_t MY_MALLOC_GETPROCADDRESS_FAILED_ER = 3; | ||
|
||
namespace detail { | ||
extern void *(*pfn_malloc)(size_t size); | ||
extern void *(*pfn_calloc)(size_t number, size_t size); | ||
extern void *(*pfn_realloc)(void *ptr, size_t size); | ||
extern void (*pfn_free)(void *ptr); | ||
extern std::once_flag init_malloc_pointers_flag; | ||
void init_malloc_pointers(); | ||
} // namespace detail | ||
} // namespace mysys | ||
|
||
#endif // _WIN32 | ||
|
||
#endif // JEMALLOC_WIN_INCLUDED |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -150,6 +150,7 @@ IF (WIN32) | |
my_winerr.cc | ||
my_winfile.cc | ||
win_timers.cc | ||
my_nojemalloc.cc | ||
) | ||
ENDIF() | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/***************************************************************************** | ||
Copyright (c) 2021, Oracle and/or its affiliates. | ||
This program is free software; you can redistribute it and/or modify it under | ||
the terms of the GNU General Public License, version 2.0, as published by the | ||
Free Software Foundation. | ||
This program is also distributed with certain software (including but not | ||
limited to OpenSSL) that is licensed under separate terms, as designated in a | ||
particular file or component or in included license documentation. The authors | ||
of MySQL hereby grant you an additional permission to link the program and | ||
your derivative works with the separately licensed software that they have | ||
included with MySQL. | ||
This program is distributed in the hope that it will be useful, but WITHOUT | ||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0, | ||
for more details. | ||
You should have received a copy of the GNU General Public License along with | ||
this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
*****************************************************************************/ | ||
|
||
#ifdef _WIN32 | ||
/* In order to use jemalloc in the mysys library, the use_jemalloc_allocations | ||
function must return true. | ||
This definition of the function (in the mysys library) returns false, so by | ||
default, the mysys library will not use jemalloc for memory allocation. | ||
Note that the linker always uses a symbol defined in an .obj file in preference | ||
to the same symbol defined in a lib. Thus a user of the mysys library who wants | ||
the mysys library to use jemalloc must provide an overriding definition (i.e. | ||
link with an obj file definition) of the use_jemalloc_allocations function that | ||
returns true. | ||
*/ | ||
extern "C" bool use_jemalloc_allocations() { return false; } | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.