mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-19274 mariadb does not build on OSes that do not have HAVE_POOL_OF_THREADS

Browse source 
Do not try to compile threadpool_common.cc, if threadpool is not available
on current OS.

Also introduced undocumented/uncached CMake variable DISABLE_THREADPOOL,
to emulate builds on exotic OSes.
This commit is contained in:
Vladislav Vaintroub 2019-04-18 05:50:59 +01:00
commit 6812fb7971
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sql/CMakeLists.txt
View file

@ -126,7 +126,7 @@ SET (SQL_SOURCE
opt_index_cond_pushdown.cc opt_subselect.cc opt_index_cond_pushdown.cc opt_subselect.cc
opt_table_elimination.cc sql_expression_cache.cc opt_table_elimination.cc sql_expression_cache.cc
gcalc_slicescan.cc gcalc_tools.cc gcalc_slicescan.cc gcalc_tools.cc
threadpool_common.cc ../sql-common/mysql_async.c ../sql-common/mysql_async.c
my_apc.cc mf_iocache_encr.cc item_jsonfunc.cc my_apc.cc mf_iocache_encr.cc item_jsonfunc.cc
my_json_writer.cc my_json_writer.cc
rpl_gtid.cc rpl_parallel.cc rpl_gtid.cc rpl_parallel.cc
@ -152,17 +152,21 @@ SET (SQL_SOURCE
${MYSYS_LIBWRAP_SOURCE} ${MYSYS_LIBWRAP_SOURCE}
) )
IF (CMAKE_SYSTEM_NAME MATCHES "Linux" OR IF ((CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Windows" OR CMAKE_SYSTEM_NAME MATCHES "SunOS" OR
CMAKE_SYSTEM_NAME MATCHES "SunOS" OR WIN32 OR
HAVE_KQUEUE) HAVE_KQUEUE)
AND (NOT DISABLE_THREADPOOL))
ADD_DEFINITIONS(-DHAVE_POOL_OF_THREADS) ADD_DEFINITIONS(-DHAVE_POOL_OF_THREADS)
IF(WIN32) IF(WIN32)
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc) SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc)
SET(SQL_SOURCE ${SQL_SOURCE} handle_connections_win.cc)
ENDIF() ENDIF()
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_generic.cc) SET(SQL_SOURCE ${SQL_SOURCE} threadpool_generic.cc)
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_common.cc)
ENDIF()
IF(WIN32)
SET(SQL_SOURCE ${SQL_SOURCE} handle_connections_win.cc)
ENDIF() ENDIF()
MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY

5
sql/handle_connections_win.cc
View file

@ -28,8 +28,13 @@
/* From mysqld.cc */ /* From mysqld.cc */
extern HANDLE hEventShutdown; extern HANDLE hEventShutdown;
extern MYSQL_SOCKET base_ip_sock, extra_ip_sock; extern MYSQL_SOCKET base_ip_sock, extra_ip_sock;
#ifdef HAVE_POOL_OF_THREADS
extern PTP_CALLBACK_ENVIRON get_threadpool_win_callback_environ(); extern PTP_CALLBACK_ENVIRON get_threadpool_win_callback_environ();
extern void tp_win_callback_prolog(); extern void tp_win_callback_prolog();
#else
#define get_threadpool_win_callback_environ() 0
#define tp_win_callback_prolog() do{}while(0)
#endif
static SECURITY_ATTRIBUTES pipe_security; static SECURITY_ATTRIBUTES pipe_security;
/** /**

7
sql/threadpool.h
View file

@ -1,3 +1,7 @@
#ifndef THREADPOOL_H_INCLUDED
#define THREADPOOL_H_INCLUDED
#ifdef HAVE_POOL_OF_THREADS
/* Copyright (C) 2012 Monty Program Ab /* Copyright (C) 2012 Monty Program Ab
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -154,3 +158,6 @@ struct TP_pool_generic :TP_pool
virtual int set_stall_limit(uint); virtual int set_stall_limit(uint);
virtual int get_idle_thread_count(); virtual int get_idle_thread_count();
}; };
#endif /* HAVE_POOL_OF_THREADS */
#endif /* THREADPOOL_H_INCLUDED */