2011-06-30 17:46:53 +02:00
|
|
|
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
|
2001-12-06 14:10:51 +02:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2001-12-06 14:10:51 +02:00
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
2000-07-31 21:29:14 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2001-12-06 14:10:51 +02:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2011-06-30 17:46:53 +02:00
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
** The following is a simple implementation of posix conditions
|
|
|
|
*****************************************************************************/
|
2009-09-30 17:40:12 +02:00
|
|
|
#if defined(_WIN32)
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2000-09-20 04:54:10 +03:00
|
|
|
#undef SAFE_MUTEX /* Avoid safe_mutex redefinitions */
|
2000-07-31 21:29:14 +02:00
|
|
|
#include "mysys_priv.h"
|
|
|
|
#include <m_string.h>
|
|
|
|
#include <process.h>
|
|
|
|
#include <sys/timeb.h>
|
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Windows native condition variables. We use runtime loading / function
|
|
|
|
pointers, because they are not available on XP
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Prototypes and function pointers for condition variable functions */
|
|
|
|
typedef VOID (WINAPI * InitializeConditionVariableProc)
|
|
|
|
(PCONDITION_VARIABLE ConditionVariable);
|
|
|
|
|
|
|
|
typedef BOOL (WINAPI * SleepConditionVariableCSProc)
|
|
|
|
(PCONDITION_VARIABLE ConditionVariable,
|
|
|
|
PCRITICAL_SECTION CriticalSection,
|
|
|
|
DWORD dwMilliseconds);
|
|
|
|
|
|
|
|
typedef VOID (WINAPI * WakeAllConditionVariableProc)
|
|
|
|
(PCONDITION_VARIABLE ConditionVariable);
|
|
|
|
|
|
|
|
typedef VOID (WINAPI * WakeConditionVariableProc)
|
|
|
|
(PCONDITION_VARIABLE ConditionVariable);
|
|
|
|
|
|
|
|
static InitializeConditionVariableProc my_InitializeConditionVariable;
|
|
|
|
static SleepConditionVariableCSProc my_SleepConditionVariableCS;
|
|
|
|
static WakeAllConditionVariableProc my_WakeAllConditionVariable;
|
|
|
|
static WakeConditionVariableProc my_WakeConditionVariable;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Indicates if we have native condition variables,
|
|
|
|
initialized first time pthread_cond_init is called.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static BOOL have_native_conditions= FALSE;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Check if native conditions can be used, load function pointers
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void check_native_cond_availability(void)
|
|
|
|
{
|
|
|
|
HMODULE module= GetModuleHandle("kernel32");
|
|
|
|
|
|
|
|
my_InitializeConditionVariable= (InitializeConditionVariableProc)
|
|
|
|
GetProcAddress(module, "InitializeConditionVariable");
|
|
|
|
my_SleepConditionVariableCS= (SleepConditionVariableCSProc)
|
|
|
|
GetProcAddress(module, "SleepConditionVariableCS");
|
|
|
|
my_WakeAllConditionVariable= (WakeAllConditionVariableProc)
|
|
|
|
GetProcAddress(module, "WakeAllConditionVariable");
|
|
|
|
my_WakeConditionVariable= (WakeConditionVariableProc)
|
|
|
|
GetProcAddress(module, "WakeConditionVariable");
|
|
|
|
|
|
|
|
if (my_InitializeConditionVariable)
|
|
|
|
have_native_conditions= TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
Convert abstime to milliseconds
|
|
|
|
*/
|
|
|
|
|
|
|
|
static DWORD get_milliseconds(const struct timespec *abstime)
|
|
|
|
{
|
|
|
|
long long millis;
|
|
|
|
union ft64 now;
|
|
|
|
|
|
|
|
if (abstime == NULL)
|
|
|
|
return INFINITE;
|
|
|
|
|
|
|
|
GetSystemTimeAsFileTime(&now.ft);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Calculate time left to abstime
|
|
|
|
- subtract start time from current time(values are in 100ns units)
|
|
|
|
- convert to millisec by dividing with 10000
|
|
|
|
*/
|
|
|
|
millis= (abstime->tv.i64 - now.i64) / 10000;
|
|
|
|
|
|
|
|
/* Don't allow the timeout to be negative */
|
|
|
|
if (millis < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Make sure the calculated timeout does not exceed original timeout
|
|
|
|
value which could cause "wait for ever" if system time changes
|
|
|
|
*/
|
|
|
|
if (millis > abstime->max_timeout_msec)
|
|
|
|
millis= abstime->max_timeout_msec;
|
|
|
|
|
|
|
|
if (millis > UINT_MAX)
|
|
|
|
millis= UINT_MAX;
|
|
|
|
|
|
|
|
return (DWORD)millis;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Old (pre-vista) implementation using events
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int legacy_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-02-15 14:08:21 +01:00
|
|
|
cond->waiting= 0;
|
|
|
|
InitializeCriticalSection(&cond->lock_waiting);
|
|
|
|
|
|
|
|
cond->events[SIGNAL]= CreateEvent(NULL, /* no security */
|
|
|
|
FALSE, /* auto-reset event */
|
|
|
|
FALSE, /* non-signaled initially */
|
|
|
|
NULL); /* unnamed */
|
|
|
|
|
|
|
|
/* Create a manual-reset event. */
|
|
|
|
cond->events[BROADCAST]= CreateEvent(NULL, /* no security */
|
|
|
|
TRUE, /* manual-reset */
|
|
|
|
FALSE, /* non-signaled initially */
|
|
|
|
NULL); /* unnamed */
|
|
|
|
|
|
|
|
|
|
|
|
cond->broadcast_block_event= CreateEvent(NULL, /* no security */
|
|
|
|
TRUE, /* manual-reset */
|
|
|
|
TRUE, /* signaled initially */
|
|
|
|
NULL); /* unnamed */
|
|
|
|
|
|
|
|
if( cond->events[SIGNAL] == NULL ||
|
|
|
|
cond->events[BROADCAST] == NULL ||
|
|
|
|
cond->broadcast_block_event == NULL )
|
2000-07-31 21:29:14 +02:00
|
|
|
return ENOMEM;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
|
|
|
|
static int legacy_cond_destroy(pthread_cond_t *cond)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-02-15 14:08:21 +01:00
|
|
|
DeleteCriticalSection(&cond->lock_waiting);
|
|
|
|
|
|
|
|
if (CloseHandle(cond->events[SIGNAL]) == 0 ||
|
|
|
|
CloseHandle(cond->events[BROADCAST]) == 0 ||
|
|
|
|
CloseHandle(cond->broadcast_block_event) == 0)
|
|
|
|
return EINVAL;
|
|
|
|
return 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
static int legacy_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
2000-07-31 21:29:14 +02:00
|
|
|
struct timespec *abstime)
|
|
|
|
{
|
|
|
|
int result;
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
DWORD timeout;
|
2007-02-15 14:08:21 +01:00
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
timeout= get_milliseconds(abstime);
|
2007-02-15 14:08:21 +01:00
|
|
|
/*
|
|
|
|
Block access if previous broadcast hasn't finished.
|
|
|
|
This is just for safety and should normally not
|
|
|
|
affect the total time spent in this function.
|
2006-12-14 15:23:44 +01:00
|
|
|
*/
|
2007-02-15 14:08:21 +01:00
|
|
|
WaitForSingleObject(cond->broadcast_block_event, INFINITE);
|
2006-12-14 15:23:44 +01:00
|
|
|
|
2007-02-15 14:08:21 +01:00
|
|
|
EnterCriticalSection(&cond->lock_waiting);
|
|
|
|
cond->waiting++;
|
|
|
|
LeaveCriticalSection(&cond->lock_waiting);
|
2006-12-14 15:23:44 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
LeaveCriticalSection(mutex);
|
2007-02-15 14:08:21 +01:00
|
|
|
result= WaitForMultipleObjects(2, cond->events, FALSE, timeout);
|
|
|
|
|
|
|
|
EnterCriticalSection(&cond->lock_waiting);
|
|
|
|
cond->waiting--;
|
|
|
|
|
2009-10-06 09:40:30 +02:00
|
|
|
if (cond->waiting == 0)
|
2007-02-15 14:08:21 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We're the last waiter to be notified or to stop waiting, so
|
|
|
|
reset the manual event.
|
|
|
|
*/
|
|
|
|
/* Close broadcast gate */
|
|
|
|
ResetEvent(cond->events[BROADCAST]);
|
|
|
|
/* Open block gate */
|
|
|
|
SetEvent(cond->broadcast_block_event);
|
|
|
|
}
|
|
|
|
LeaveCriticalSection(&cond->lock_waiting);
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
EnterCriticalSection(mutex);
|
|
|
|
|
|
|
|
return result == WAIT_TIMEOUT ? ETIMEDOUT : 0;
|
|
|
|
}
|
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
static int legacy_cond_signal(pthread_cond_t *cond)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-02-15 14:08:21 +01:00
|
|
|
EnterCriticalSection(&cond->lock_waiting);
|
|
|
|
|
|
|
|
if(cond->waiting > 0)
|
|
|
|
SetEvent(cond->events[SIGNAL]);
|
|
|
|
|
|
|
|
LeaveCriticalSection(&cond->lock_waiting);
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
static int legacy_cond_broadcast(pthread_cond_t *cond)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-02-15 14:08:21 +01:00
|
|
|
EnterCriticalSection(&cond->lock_waiting);
|
|
|
|
/*
|
|
|
|
The mutex protect us from broadcasting if
|
|
|
|
there isn't any thread waiting to open the
|
|
|
|
block gate after this call has closed it.
|
|
|
|
*/
|
|
|
|
if(cond->waiting > 0)
|
|
|
|
{
|
|
|
|
/* Close block gate */
|
|
|
|
ResetEvent(cond->broadcast_block_event);
|
|
|
|
/* Open broadcast gate */
|
|
|
|
SetEvent(cond->events[BROADCAST]);
|
|
|
|
}
|
|
|
|
|
|
|
|
LeaveCriticalSection(&cond->lock_waiting);
|
|
|
|
|
|
|
|
return 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock
detector". This patch addresses performance regression in OLTP_RO/MyISAM
test on Windows introduced by the fix for bug #56405. Thus it makes
original patch acceptable as a solution for bug #56585 "Slowdown of
readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
With this patch, MySQL will use native Windows condition variables and
reader-writer locks if they are supported by the OS.
This speeds up MyISAM and the effect comes mostly from using native
rwlocks. Native conditions improve scalability with higher number of
concurrent users in other situations, e.g for prlocks.
Benchmark numbers for this patch as measured on Win2008R2 quad
core machine are attached to the bug report.
( direct link http://bugs.mysql.com/file.php?id=15883 )
Note that currently we require at least Windows7/WS2008R2 for
reader-writer locks, even though native rwlock is available also on Vista.
Reason is that "trylock" APIs are missing on Vista, and trylock is used in
the server (in a single place in query cache).
While this patch could have been written differently, to enable the native
rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
but portable implementation in query cache), this would come at the
expense of the code clarity, as it would introduce a new "try-able" rwlock
type, to handle Vista case.
Another way to improve performance for the special case
(OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
but this is outside of the scope here.
Native conditions variables are used beginning with Vista though the effect
of using condition variables alone is not measurable in this benchmark.
But when used together with native rwlocks on Win7, native conditions improve
performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench
users).
2010-10-04 13:03:11 +02:00
|
|
|
/*
|
|
|
|
Posix API functions. Just choose between native and legacy implementation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Once initialization is used here rather than in my_init(), to
|
|
|
|
1) avoid my_init() pitfalls- undefined order in which initialization should
|
|
|
|
run
|
|
|
|
2) be potentially useful C++ (in static constructors that run before main())
|
|
|
|
3) just to simplify the API.
|
|
|
|
Also, the overhead of my_pthread_once is very small.
|
|
|
|
*/
|
|
|
|
static my_pthread_once_t once_control= MY_PTHREAD_ONCE_INIT;
|
|
|
|
my_pthread_once(&once_control, check_native_cond_availability);
|
|
|
|
|
|
|
|
if (have_native_conditions)
|
|
|
|
{
|
|
|
|
my_InitializeConditionVariable(&cond->native_cond);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return legacy_cond_init(cond, attr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int pthread_cond_destroy(pthread_cond_t *cond)
|
|
|
|
{
|
|
|
|
if (have_native_conditions)
|
|
|
|
return 0; /* no destroy function */
|
|
|
|
else
|
|
|
|
return legacy_cond_destroy(cond);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int pthread_cond_broadcast(pthread_cond_t *cond)
|
|
|
|
{
|
|
|
|
if (have_native_conditions)
|
|
|
|
{
|
|
|
|
my_WakeAllConditionVariable(&cond->native_cond);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return legacy_cond_broadcast(cond);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int pthread_cond_signal(pthread_cond_t *cond)
|
|
|
|
{
|
|
|
|
if (have_native_conditions)
|
|
|
|
{
|
|
|
|
my_WakeConditionVariable(&cond->native_cond);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return legacy_cond_signal(cond);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|
|
|
struct timespec *abstime)
|
|
|
|
{
|
|
|
|
if (have_native_conditions)
|
|
|
|
{
|
|
|
|
DWORD timeout= get_milliseconds(abstime);
|
|
|
|
if (!my_SleepConditionVariableCS(&cond->native_cond, mutex, timeout))
|
|
|
|
return ETIMEDOUT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return legacy_cond_timedwait(cond, mutex, abstime);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
|
|
|
{
|
|
|
|
return pthread_cond_timedwait(cond, mutex, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int pthread_attr_init(pthread_attr_t *connect_att)
|
|
|
|
{
|
|
|
|
connect_att->dwStackSize = 0;
|
|
|
|
connect_att->dwCreatingFlag = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack)
|
|
|
|
{
|
|
|
|
connect_att->dwStackSize=stack;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int pthread_attr_destroy(pthread_attr_t *connect_att)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 12:59:39 +03:00
|
|
|
bzero((uchar*) connect_att,sizeof(*connect_att));
|
2000-07-31 21:29:14 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
** Fix localtime_r() to be a bit safer
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
struct tm *localtime_r(const time_t *timep,struct tm *tmp)
|
|
|
|
{
|
|
|
|
if (*timep == (time_t) -1) /* This will crash win32 */
|
|
|
|
{
|
|
|
|
bzero(tmp,sizeof(*tmp));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct tm *res=localtime(timep);
|
|
|
|
if (!res) /* Wrong date */
|
|
|
|
{
|
|
|
|
bzero(tmp,sizeof(*tmp)); /* Keep things safe */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*tmp= *res;
|
|
|
|
}
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
#endif /* __WIN__ */
|