HAVE_LARGE_PAGES no longer global

cmake/os/SunOS.cmake

@@ -35,7 +35,6 @@ SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
 CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_DECL_MHA_MAPSIZE_VA)
 IF(HAVE_DECL_MHA_MAPSIZE_VA)
  SET(HAVE_SOLARIS_LARGE_PAGES 1)
- SET(HAVE_LARGE_PAGES 1)
 ENDIF()
 
 

cmake/os/Windows.cmake

@@ -281,7 +281,6 @@ ENDIF()
 
 SET(FN_NO_CASE_SENSE 1)
 SET(USE_SYMDIR 1)
-SET(HAVE_LARGE_PAGES 1)
 
 # Force static C runtime for targets in current directory
 # (useful to get rid of MFC dll's dependency, or in installer)

config.h.cmake

@@ -164,7 +164,6 @@
 #cmakedefine gmtime_r @gmtime_r@
 #cmakedefine HAVE_IN_ADDR_T 1
 #cmakedefine HAVE_INITGROUPS 1
-#cmakedefine HAVE_LARGE_PAGES 1
 #cmakedefine HAVE_LDIV 1
 #cmakedefine HAVE_LRAND48 1
 #cmakedefine HAVE_LOCALTIME_R 1

configure.cmake

@@ -415,10 +415,6 @@ CHECK_FUNCTION_EXISTS (vsnprintf HAVE_VSNPRINTF)
 CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
 
-IF(HAVE_MMAP)
-  SET(HAVE_LARGE_PAGES 1)
-ENDIF()
-
 IF(HAVE_SYS_EVENT_H)
 CHECK_FUNCTION_EXISTS (kqueue HAVE_KQUEUE)
 ENDIF()

include/my_sys.h

@@ -176,14 +176,9 @@ extern void *my_memdup(PSI_memory_key key, const void *from,size_t length,myf My
 extern char *my_strdup(PSI_memory_key key, const char *from,myf MyFlags);
 extern char *my_strndup(PSI_memory_key key, const char *from, size_t length, myf MyFlags);
 
-#ifdef HAVE_LARGE_PAGES
 int my_init_large_pages(my_bool super_large_pages);
 uchar *my_large_malloc(size_t *size, myf my_flags);
 void my_large_free(void *ptr, size_t size);
-#else
-#define my_large_malloc(A, B) my_malloc_lock(*(A), (B))
-#define my_large_free(A, B) my_free_lock((A))
-#endif /* HAVE_LARGE_PAGES */
 
 #ifdef _WIN32
 extern BOOL my_obtain_privilege(LPCSTR lpPrivilege);

mysys/CMakeLists.txt

@@ -44,7 +44,7 @@ SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c my_default.c
 				my_getncpus.c my_safehash.c my_chmod.c my_rnd.c
                                 my_uuid.c wqueue.c waiting_threads.c ma_dyncol.c ../sql-common/my_time.c
 				my_rdtsc.c my_context.c psi_noop.c
-                                my_atomic_writes.c my_cpu.c my_likely.c
+                                my_atomic_writes.c my_cpu.c my_likely.c my_largepage.c
                                 file_logger.c my_dlerror.c)
 
 IF (WIN32)
@@ -66,10 +66,6 @@ IF(HAVE_ALARM)
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c)
 ENDIF()
 
-IF(HAVE_LARGE_PAGES)
- SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_largepage.c)
-ENDIF()
-
 IF(HAVE_MLOCK)
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_lockmem.c)
 ENDIF()

mysys/my_largepage.c

@@ -40,6 +40,9 @@ extern int memcntl(caddr_t, size_t, int, caddr_t, int, int);
 
 #if defined(_WIN32)
 static size_t my_large_page_size;
+#define HAVE_LARGE_PAGES
+#elif defined(HAVE_MMAP)
+#define HAVE_LARGE_PAGES
 #endif
 
 #ifdef HAVE_LARGE_PAGES

sql/mysqld.cc

@@ -3937,7 +3937,6 @@ static int init_common_variables()
   DBUG_PRINT("info",("%s  Ver %s for %s on %s\n",my_progname,
 		     server_version, SYSTEM_TYPE,MACHINE_TYPE));
 
-#ifdef HAVE_LARGE_PAGES
   /* Initialize large page size */
   if (opt_large_pages)
   {
@@ -3947,7 +3946,6 @@ static int init_common_variables()
       return 1;
     }
   }
-#endif /* HAVE_LARGE_PAGES */
 
 #if defined(HAVE_POOL_OF_THREADS)
   if (IS_SYSVAR_AUTOSIZE(&threadpool_size))