hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436

Browse Source 
Added autodetection of processor cores and used it as the default if an
invalid value is used for threads.
This commit is contained in:
Markus Makela
2015-10-31 07:36:22 +02:00
parent 112e21d507
commit 6810ed15dd
6 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/config.c
View File

@ -75,6 +75,7 @@
#include <sys/utsname.h>
#include <pcre.h>
#include <dbusers.h>
#include <gw.h>
#define PCRE2_CODE_UNIT_WIDTH 8
#include <pcre2.h>
@ -1494,6 +1495,15 @@ CONFIG_PARAMETER *p1, *p2;
int
config_threadcount()
{
spinlock_acquire(&gateway.lock);
if(gateway.n_threads <= 0)
{
int nthr = get_processor_count();
skygw_log_write(LE, "Warning: Invalid value for 'threads': %d. Using default "
"number of %d threads.", gateway.n_threads, nthr);
gateway.n_threads = nthr;
}
spinlock_release(&gateway.lock);
return gateway.n_threads;
}
@ -1657,7 +1667,8 @@ global_defaults()
{
uint8_t mac_addr[6]="";
struct utsname uname_data;
gateway.n_threads = 1;
spinlock_init(&gateway.lock);
gateway.n_threads = get_processor_count();
gateway.n_nbpoll = DEFAULT_NBPOLLS;
gateway.pollsleep = DEFAULT_POLLSLEEP;
gateway.auth_conn_timeout = DEFAULT_AUTH_CONNECT_TIMEOUT;