mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup HAVE_MMAP_ALIGNED: one cmake check less

Browse source
This commit is contained in:
Sergey Vojtovich 2020-04-03 20:29:38 +04:00
parent 40f4d8c671
commit fc6e8b4b1b
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/os/FreeBSD.cmake
View file

@ -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)

1
config.h.cmake
View file

@ -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

2
include/my_sys.h
View file

@ -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_MMAP_ALIGNED))
&& !defined(MAP_ALIGNED))
extern void my_get_large_page_size(void);
#else
#define my_get_large_page_size() do {} while(0)

8
mysys/my_largepage.c
View file

@ -23,7 +23,7 @@
#include <linux/mman.h>
#include <dirent.h>
#endif
#if defined(__linux__) || defined(HAVE_MMAP_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_MMAP_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_MMAP_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_MMAP_ALIGNED) \
#if defined(HAVE_MMAP) && !defined(__linux__) && !defined(MAP_ALIGNED) \
&& !defined(_WIN32)
/* Solaris for example has only MAP_ANON, FreeBSD has MAP_ANONYMOUS and