diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2020-04-03 20:29:38 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2020-04-04 14:55:51 +0400 |
| commit | fc6e8b4b1b2f9fcb62d0459892c59ece759fd144 (patch) | |
| tree | 58f99fb111ed3d434c73e01af71fd8a3532c38df | |
| parent | 40f4d8c6715320aa3188f46bbc9958cd4768d0fa (diff) | |
| download | mariadb-git-fc6e8b4b1b2f9fcb62d0459892c59ece759fd144.tar.gz | |
Cleanup HAVE_MMAP_ALIGNED: one cmake check less
| -rw-r--r-- | cmake/os/FreeBSD.cmake | 4 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | mysys/my_largepage.c | 8 |
4 files changed, 5 insertions, 10 deletions
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake index a708765e42a..9d3673aae86 100644 --- a/cmake/os/FreeBSD.cmake +++ b/cmake/os/FreeBSD.cmake @@ -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) diff --git a/config.h.cmake b/config.h.cmake index 61c266b83fe..103364a259d 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -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 diff --git a/include/my_sys.h b/include/my_sys.h index 68f67dc5bdf..1c8d46b78e4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -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) diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index c0d11ca6345..95813ccee1c 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.c @@ -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 |