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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fc6e8b4b
Commit
fc6e8b4b
authored
Apr 03, 2020
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup HAVE_MMAP_ALIGNED: one cmake check less
parent
40f4d8c6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
10 deletions
+5
-10
cmake/os/FreeBSD.cmake
cmake/os/FreeBSD.cmake
+0
-4
config.h.cmake
config.h.cmake
+0
-1
include/my_sys.h
include/my_sys.h
+1
-1
mysys/my_largepage.c
mysys/my_largepage.c
+4
-4
No files found.
cmake/os/FreeBSD.cmake
View file @
fc6e8b4b
...
...
@@ -32,7 +32,3 @@ FIND_LIBRARY(EXECINFO NAMES execinfo)
IF
(
EXECINFO
)
SET
(
LIBEXECINFO
${
EXECINFO
}
)
ENDIF
()
INCLUDE
(
CheckSymbolExists
)
CHECK_SYMBOL_EXISTS
(
MAP_ALIGNED
"sys/mman.h"
HAVE_MMAP_ALIGNED
)
config.h.cmake
View file @
fc6e8b4b
...
...
@@ -183,7 +183,6 @@
#cmakedefine HAVE_MLOCKALL 1
#cmakedefine HAVE_MMAP 1
#cmakedefine HAVE_MMAP64 1
#cmakedefine HAVE_MMAP_ALIGNED 1
#cmakedefine HAVE_PERROR 1
#cmakedefine HAVE_POLL 1
#cmakedefine HAVE_POSIX_FALLOCATE 1
...
...
include/my_sys.h
View file @
fc6e8b4b
...
...
@@ -183,7 +183,7 @@ extern size_t my_next_large_page_size(size_t sz, int *start);
#endif
#if defined(_WIN32) || (defined(HAVE_MMAP) && !defined(__linux__) \
&& !defined(
HAVE_M
MAP_ALIGNED))
&& !defined(MAP_ALIGNED))
extern
void
my_get_large_page_size
(
void
);
#else
#define my_get_large_page_size() do {} while(0)
...
...
mysys/my_largepage.c
View file @
fc6e8b4b
...
...
@@ -23,7 +23,7 @@
#include <linux/mman.h>
#include <dirent.h>
#endif
#if defined(__linux__) || defined(
HAVE_M
MAP_ALIGNED)
#if defined(__linux__) || defined(MAP_ALIGNED)
#include "my_bit.h"
#endif
...
...
@@ -267,7 +267,7 @@ static void my_get_large_page_sizes(size_t sizes[my_large_page_sizes_length])
/* Multisized (Linux/FreeBSD) large pages allocator */
#if defined(__linux__) || defined(
HAVE_M
MAP_ALIGNED)
#if defined(__linux__) || defined(MAP_ALIGNED)
uchar
*
my_large_malloc_int
(
size_t
*
size
,
myf
my_flags
)
{
uchar
*
ptr
;
...
...
@@ -343,7 +343,7 @@ uchar* my_large_malloc_int(size_t *size, myf my_flags)
DBUG_RETURN
(
ptr
);
}
#endif
/* defined(__linux__) || defined(
HAVE_M
MAP_ALIGNED) */
#endif
/* defined(__linux__) || defined(MAP_ALIGNED) */
#if defined(HAVE_GETPAGESIZES) && !defined(__linux__)
static
void
my_get_large_page_sizes
(
size_t
sizes
[
my_large_page_sizes_length
])
...
...
@@ -383,7 +383,7 @@ my_bool my_large_free_int(void *ptr, size_t size)
}
#endif
/* HAVE_MMAP */
#if defined(HAVE_MMAP) && !defined(__linux__) && !defined(
HAVE_M
MAP_ALIGNED) \
#if defined(HAVE_MMAP) && !defined(__linux__) && !defined(MAP_ALIGNED) \
&& !defined(_WIN32)
/* Solaris for example has only MAP_ANON, FreeBSD has MAP_ANONYMOUS and
...
...
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