Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1bd1c29e
Commit
1bd1c29e
authored
Nov 28, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6895 switch to dynamic libjemalloc.so
parent
0438f125
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
17 deletions
+24
-17
cmake/build_configurations/mysql_release.cmake
cmake/build_configurations/mysql_release.cmake
+0
-2
cmake/jemalloc.cmake
cmake/jemalloc.cmake
+24
-15
No files found.
cmake/build_configurations/mysql_release.cmake
View file @
1bd1c29e
...
...
@@ -111,8 +111,6 @@ IF(UNIX)
SET
(
WITH_EXTRA_CHARSETS all CACHE STRING
""
)
IF
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
SET
(
WITH_JEMALLOC
"static"
CACHE STRING
""
)
IF
(
NOT IGNORE_AIO_CHECK
)
# Ensure aio is available on Linux (required by InnoDB)
CHECK_INCLUDE_FILES
(
libaio.h HAVE_LIBAIO_H
)
...
...
cmake/jemalloc.cmake
View file @
1bd1c29e
INCLUDE
(
CheckLibraryExists
)
SET
(
WITH_JEMALLOC auto CACHE STRING
"Build with jemalloc. Possible values are 'yes', 'no', 'auto'"
)
"Build with jemalloc. Possible values are 'yes', 'no', 'static', 'auto'"
)
MACRO
(
JEMALLOC_TRY_STATIC
)
SET
(
libname jemalloc_pic
)
SET
(
CMAKE_REQUIRED_LIBRARIES pthread dl m
)
SET
(
what bundled
)
CHECK_LIBRARY_EXISTS
(
${
libname
}
malloc_stats_print
""
HAVE_STATIC_JEMALLOC
)
SET
(
CMAKE_REQUIRED_LIBRARIES
)
ENDMACRO
()
MACRO
(
JEMALLOC_TRY_DYNAMIC
)
SET
(
libname jemalloc
)
SET
(
what system
)
CHECK_LIBRARY_EXISTS
(
${
libname
}
malloc_stats_print
""
HAVE_DYNAMIC_JEMALLOC
)
ENDMACRO
()
MACRO
(
CHECK_JEMALLOC
)
# compatibility with old WITH_JEMALLOC values
...
...
@@ -12,22 +26,17 @@ MACRO (CHECK_JEMALLOC)
SET
(
WITH_JEMALLOC
"yes"
)
ENDIF
()
IF
(
WITH_JEMALLOC STREQUAL
"yes"
OR WITH_JEMALLOC STREQUAL
"auto"
OR
WITH_JEMALLOC STREQUAL
"static"
)
IF
(
WITH_JEMALLOC STREQUAL
"static"
)
SET
(
libname jemalloc_pic
)
SET
(
CMAKE_REQUIRED_LIBRARIES pthread dl m
)
SET
(
what bundled
)
ELSE
()
SET
(
libname jemalloc
)
SET
(
what system
)
ENDIF
()
IF
(
WITH_JEMALLOC STREQUAL
"yes"
OR WITH_JEMALLOC STREQUAL
"auto"
)
JEMALLOC_TRY_DYNAMIC
()
ENDIF
()
CHECK_LIBRARY_EXISTS
(
${
libname
}
malloc_stats_print
""
HAVE_JEMALLOC
)
SET
(
CMAKE_REQUIRED_LIBRARIES
)
IF
(
WITH_JEMALLOC STREQUAL
"static"
OR WITH_JEMALLOC STREQUAL
"auto"
AND NOT HAVE_DYNAMIC_JEMALLOC
)
JEMALLOC_TRY_STATIC
()
ENDIF
()
IF
(
HAVE_JEMALLOC
)
IF
(
libname
)
IF
(
HAVE_DYNAMIC_JEMALLOC OR HAVE_STATIC_JEMALLOC
)
SET
(
LIBJEMALLOC
${
libname
}
)
SET
(
MALLOC_LIBRARY
"
${
what
}
jemalloc"
)
ELSEIF
(
NOT WITH_JEMALLOC STREQUAL
"auto"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment