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
30379b48
Commit
30379b48
authored
Apr 03, 2020
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HAVE_LARGE_PAGE_OPTION to HAVE_LARGE_PAGES
It isn't an "option" anymore.
parent
4338bb8a
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
12 deletions
+12
-12
cmake/os/SunOS.cmake
cmake/os/SunOS.cmake
+1
-1
cmake/os/Windows.cmake
cmake/os/Windows.cmake
+1
-1
config.h.cmake
config.h.cmake
+1
-1
configure.cmake
configure.cmake
+1
-1
include/my_sys.h
include/my_sys.h
+2
-2
mysys/CMakeLists.txt
mysys/CMakeLists.txt
+1
-1
mysys/my_largepage.c
mysys/my_largepage.c
+3
-3
sql/mysqld.cc
sql/mysqld.cc
+2
-2
No files found.
cmake/os/SunOS.cmake
View file @
30379b48
...
@@ -35,7 +35,7 @@ SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
...
@@ -35,7 +35,7 @@ SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
CHECK_SYMBOL_EXISTS
(
MHA_MAPSIZE_VA sys/mman.h HAVE_DECL_MHA_MAPSIZE_VA
)
CHECK_SYMBOL_EXISTS
(
MHA_MAPSIZE_VA sys/mman.h HAVE_DECL_MHA_MAPSIZE_VA
)
IF
(
HAVE_DECL_MHA_MAPSIZE_VA
)
IF
(
HAVE_DECL_MHA_MAPSIZE_VA
)
SET
(
HAVE_SOLARIS_LARGE_PAGES 1
)
SET
(
HAVE_SOLARIS_LARGE_PAGES 1
)
SET
(
HAVE_LARGE_PAGE
_OPTION
1
)
SET
(
HAVE_LARGE_PAGE
S
1
)
ENDIF
()
ENDIF
()
...
...
cmake/os/Windows.cmake
View file @
30379b48
...
@@ -281,7 +281,7 @@ ENDIF()
...
@@ -281,7 +281,7 @@ ENDIF()
SET
(
FN_NO_CASE_SENSE 1
)
SET
(
FN_NO_CASE_SENSE 1
)
SET
(
USE_SYMDIR 1
)
SET
(
USE_SYMDIR 1
)
SET
(
HAVE_LARGE_PAGE
_OPTION
1
)
SET
(
HAVE_LARGE_PAGE
S
1
)
# Force static C runtime for targets in current directory
# Force static C runtime for targets in current directory
# (useful to get rid of MFC dll's dependency, or in installer)
# (useful to get rid of MFC dll's dependency, or in installer)
...
...
config.h.cmake
View file @
30379b48
...
@@ -164,7 +164,7 @@
...
@@ -164,7 +164,7 @@
#cmakedefine gmtime_r @gmtime_r@
#cmakedefine gmtime_r @gmtime_r@
#cmakedefine HAVE_IN_ADDR_T 1
#cmakedefine HAVE_IN_ADDR_T 1
#cmakedefine HAVE_INITGROUPS 1
#cmakedefine HAVE_INITGROUPS 1
#cmakedefine HAVE_LARGE_PAGE
_OPTION
1
#cmakedefine HAVE_LARGE_PAGE
S
1
#cmakedefine HAVE_LDIV 1
#cmakedefine HAVE_LDIV 1
#cmakedefine HAVE_LRAND48 1
#cmakedefine HAVE_LRAND48 1
#cmakedefine HAVE_LOCALTIME_R 1
#cmakedefine HAVE_LOCALTIME_R 1
...
...
configure.cmake
View file @
30379b48
...
@@ -416,7 +416,7 @@ CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
...
@@ -416,7 +416,7 @@ CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
CHECK_FUNCTION_EXISTS
(
nl_langinfo HAVE_NL_LANGINFO
)
CHECK_FUNCTION_EXISTS
(
nl_langinfo HAVE_NL_LANGINFO
)
IF
(
HAVE_MMAP
)
IF
(
HAVE_MMAP
)
SET
(
HAVE_LARGE_PAGE
_OPTION
1
)
SET
(
HAVE_LARGE_PAGE
S
1
)
ENDIF
()
ENDIF
()
IF
(
HAVE_SYS_EVENT_H
)
IF
(
HAVE_SYS_EVENT_H
)
...
...
include/my_sys.h
View file @
30379b48
...
@@ -183,14 +183,14 @@ extern void my_get_large_page_size(void);
...
@@ -183,14 +183,14 @@ extern void my_get_large_page_size(void);
#define my_get_large_page_size() do {} while(0)
#define my_get_large_page_size() do {} while(0)
#endif
#endif
#ifdef HAVE_LARGE_PAGE
_OPTION
#ifdef HAVE_LARGE_PAGE
S
int
my_init_large_pages
(
my_bool
super_large_pages
);
int
my_init_large_pages
(
my_bool
super_large_pages
);
uchar
*
my_large_malloc
(
size_t
*
size
,
myf
my_flags
);
uchar
*
my_large_malloc
(
size_t
*
size
,
myf
my_flags
);
void
my_large_free
(
void
*
ptr
,
size_t
size
);
void
my_large_free
(
void
*
ptr
,
size_t
size
);
#else
#else
#define my_large_malloc(A, B) my_malloc_lock(*(A), (B))
#define my_large_malloc(A, B) my_malloc_lock(*(A), (B))
#define my_large_free(A, B) my_free_lock((A))
#define my_large_free(A, B) my_free_lock((A))
#endif
/* HAVE_LARGE_PAGE
_OPTION
*/
#endif
/* HAVE_LARGE_PAGE
S
*/
#ifdef _WIN32
#ifdef _WIN32
extern
BOOL
my_obtain_privilege
(
LPCSTR
lpPrivilege
);
extern
BOOL
my_obtain_privilege
(
LPCSTR
lpPrivilege
);
...
...
mysys/CMakeLists.txt
View file @
30379b48
...
@@ -66,7 +66,7 @@ IF(HAVE_ALARM)
...
@@ -66,7 +66,7 @@ IF(HAVE_ALARM)
SET
(
MYSYS_SOURCES
${
MYSYS_SOURCES
}
my_alarm.c
)
SET
(
MYSYS_SOURCES
${
MYSYS_SOURCES
}
my_alarm.c
)
ENDIF
()
ENDIF
()
IF
(
HAVE_LARGE_PAGE
_OPTION
)
IF
(
HAVE_LARGE_PAGE
S
)
SET
(
MYSYS_SOURCES
${
MYSYS_SOURCES
}
my_largepage.c
)
SET
(
MYSYS_SOURCES
${
MYSYS_SOURCES
}
my_largepage.c
)
ENDIF
()
ENDIF
()
...
...
mysys/my_largepage.c
View file @
30379b48
...
@@ -38,7 +38,7 @@ extern int memcntl(caddr_t, size_t, int, caddr_t, int, int);
...
@@ -38,7 +38,7 @@ extern int memcntl(caddr_t, size_t, int, caddr_t, int, int);
#endif
/* __sun__ ... */
#endif
/* __sun__ ... */
#endif
/* HAVE_SOLARIS_LARGE_PAGES */
#endif
/* HAVE_SOLARIS_LARGE_PAGES */
#ifdef HAVE_LARGE_PAGE
_OPTION
#ifdef HAVE_LARGE_PAGE
S
static
my_bool
my_use_large_pages
=
0
;
static
my_bool
my_use_large_pages
=
0
;
#else
#else
#define my_use_large_pages 0
#define my_use_large_pages 0
...
@@ -58,7 +58,7 @@ static inline my_bool my_is_2pow(size_t n) { return !((n) & ((n) - 1)); }
...
@@ -58,7 +58,7 @@ static inline my_bool my_is_2pow(size_t n) { return !((n) & ((n) - 1)); }
static
uchar
*
my_large_malloc_int
(
size_t
*
size
,
myf
my_flags
);
static
uchar
*
my_large_malloc_int
(
size_t
*
size
,
myf
my_flags
);
static
my_bool
my_large_free_int
(
void
*
ptr
,
size_t
size
);
static
my_bool
my_large_free_int
(
void
*
ptr
,
size_t
size
);
#ifdef HAVE_LARGE_PAGE
_OPTION
#ifdef HAVE_LARGE_PAGE
S
#if defined(HAVE_GETPAGESIZES) || defined(__linux__)
#if defined(HAVE_GETPAGESIZES) || defined(__linux__)
/* Descending sort */
/* Descending sort */
...
@@ -226,7 +226,7 @@ void my_large_free(void *ptr, size_t size)
...
@@ -226,7 +226,7 @@ void my_large_free(void *ptr, size_t size)
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
#endif
/* HAVE_LARGE_PAGE
_OPTION
*/
#endif
/* HAVE_LARGE_PAGE
S
*/
#ifdef __linux__
#ifdef __linux__
...
...
sql/mysqld.cc
View file @
30379b48
...
@@ -3937,7 +3937,7 @@ static int init_common_variables()
...
@@ -3937,7 +3937,7 @@ static int init_common_variables()
DBUG_PRINT
(
"info"
,(
"%s Ver %s for %s on %s
\n
"
,
my_progname
,
DBUG_PRINT
(
"info"
,(
"%s Ver %s for %s on %s
\n
"
,
my_progname
,
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
));
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
));
#ifdef HAVE_LARGE_PAGE
_OPTION
#ifdef HAVE_LARGE_PAGE
S
/* Initialize large page size */
/* Initialize large page size */
if
(
opt_large_pages
)
if
(
opt_large_pages
)
{
{
...
@@ -3952,7 +3952,7 @@ static int init_common_variables()
...
@@ -3952,7 +3952,7 @@ static int init_common_variables()
This function must be called after my_init_large_pages.
This function must be called after my_init_large_pages.
*/
*/
my_get_large_page_size
();
my_get_large_page_size
();
#endif
/* HAVE_LARGE_PAGE
_OPTION
*/
#endif
/* HAVE_LARGE_PAGE
S
*/
#if defined(HAVE_POOL_OF_THREADS)
#if defined(HAVE_POOL_OF_THREADS)
if
(
IS_SYSVAR_AUTOSIZE
(
&
threadpool_size
))
if
(
IS_SYSVAR_AUTOSIZE
(
&
threadpool_size
))
...
...
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