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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
310c4705
Commit
310c4705
authored
Jul 06, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents
daa3ebb6
6dc280da
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
18 deletions
+8
-18
configure.in
configure.in
+2
-2
innobase/include/srv0srv.h
innobase/include/srv0srv.h
+1
-0
innobase/srv/srv0srv.c
innobase/srv/srv0srv.c
+3
-14
sql/ha_innodb.cc
sql/ha_innodb.cc
+2
-2
No files found.
configure.in
View file @
310c4705
...
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)dnl Minimum Autoconf version required.
...
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)dnl Minimum Autoconf version required.
AC_INIT
(
sql/mysqld.cc
)
AC_INIT
(
sql/mysqld.cc
)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
# Don't forget to also update the NDB lines below.
# Don't forget to also update the NDB lines below.
AM_INIT_AUTOMAKE
(
mysql, 5.0.
9
-beta
)
AM_INIT_AUTOMAKE
(
mysql, 5.0.
10
-beta
)
AM_CONFIG_HEADER
(
config.h
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
PROTOCOL_VERSION
=
10
...
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0
...
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0
# ndb version
# ndb version
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MINOR
=
0
NDB_VERSION_MINOR
=
0
NDB_VERSION_BUILD
=
9
NDB_VERSION_BUILD
=
10
NDB_VERSION_STATUS
=
"beta"
NDB_VERSION_STATUS
=
"beta"
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
innobase/include/srv0srv.h
View file @
310c4705
...
@@ -182,6 +182,7 @@ extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs,
...
@@ -182,6 +182,7 @@ extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs,
#define kernel_mutex (*kernel_mutex_temp)
#define kernel_mutex (*kernel_mutex_temp)
#define SRV_MAX_N_IO_THREADS 100
#define SRV_MAX_N_IO_THREADS 100
#define SRV_CONCURRENCY_THRESHOLD 20
/* Array of English strings describing the current state of an
/* Array of English strings describing the current state of an
i/o handler thread */
i/o handler thread */
...
...
innobase/srv/srv0srv.c
View file @
310c4705
...
@@ -260,7 +260,7 @@ semaphore contention and convoy problems can occur withput this restriction.
...
@@ -260,7 +260,7 @@ semaphore contention and convoy problems can occur withput this restriction.
Value 10 should be good if there are less than 4 processors + 4 disks in the
Value 10 should be good if there are less than 4 processors + 4 disks in the
computer. Bigger computers need bigger values. */
computer. Bigger computers need bigger values. */
ulong
srv_thread_concurrency
=
8
;
ulong
srv_thread_concurrency
=
SRV_CONCURRENCY_THRESHOLD
;
os_fast_mutex_t
srv_conc_mutex
;
/* this mutex protects srv_conc data
os_fast_mutex_t
srv_conc_mutex
;
/* this mutex protects srv_conc data
structures */
structures */
...
@@ -983,12 +983,6 @@ srv_conc_enter_innodb(
...
@@ -983,12 +983,6 @@ srv_conc_enter_innodb(
srv_conc_slot_t
*
slot
=
NULL
;
srv_conc_slot_t
*
slot
=
NULL
;
ulint
i
;
ulint
i
;
if
(
srv_thread_concurrency
>=
500
)
{
/* Disable the concurrency check */
return
;
}
/* If trx has 'free tickets' to enter the engine left, then use one
/* If trx has 'free tickets' to enter the engine left, then use one
such ticket */
such ticket */
...
@@ -1134,7 +1128,7 @@ srv_conc_force_enter_innodb(
...
@@ -1134,7 +1128,7 @@ srv_conc_force_enter_innodb(
trx_t
*
trx
)
/* in: transaction object associated with the
trx_t
*
trx
)
/* in: transaction object associated with the
thread */
thread */
{
{
if
(
srv_thread_concurrency
>=
500
)
{
if
(
srv_thread_concurrency
>=
SRV_CONCURRENCY_THRESHOLD
)
{
return
;
return
;
}
}
...
@@ -1160,7 +1154,7 @@ srv_conc_force_exit_innodb(
...
@@ -1160,7 +1154,7 @@ srv_conc_force_exit_innodb(
{
{
srv_conc_slot_t
*
slot
=
NULL
;
srv_conc_slot_t
*
slot
=
NULL
;
if
(
srv_thread_concurrency
>=
500
)
{
if
(
srv_thread_concurrency
>=
SRV_CONCURRENCY_THRESHOLD
)
{
return
;
return
;
}
}
...
@@ -1212,11 +1206,6 @@ srv_conc_exit_innodb(
...
@@ -1212,11 +1206,6 @@ srv_conc_exit_innodb(
trx_t
*
trx
)
/* in: transaction object associated with the
trx_t
*
trx
)
/* in: transaction object associated with the
thread */
thread */
{
{
if
(
srv_thread_concurrency
>=
500
)
{
return
;
}
if
(
trx
->
n_tickets_to_enter_innodb
>
0
)
{
if
(
trx
->
n_tickets_to_enter_innodb
>
0
)
{
/* We will pretend the thread is still inside InnoDB though it
/* We will pretend the thread is still inside InnoDB though it
now leaves the InnoDB engine. In this way we save
now leaves the InnoDB engine. In this way we save
...
...
sql/ha_innodb.cc
View file @
310c4705
...
@@ -326,7 +326,7 @@ innodb_srv_conc_enter_innodb(
...
@@ -326,7 +326,7 @@ innodb_srv_conc_enter_innodb(
/*=========================*/
/*=========================*/
trx_t
*
trx
)
/* in: transaction handle */
trx_t
*
trx
)
/* in: transaction handle */
{
{
if
(
UNIV_LIKELY
(
srv_thread_concurrency
>=
20
))
{
if
(
UNIV_LIKELY
(
srv_thread_concurrency
>=
SRV_CONCURRENCY_THRESHOLD
))
{
return
;
return
;
}
}
...
@@ -343,7 +343,7 @@ innodb_srv_conc_exit_innodb(
...
@@ -343,7 +343,7 @@ innodb_srv_conc_exit_innodb(
/*========================*/
/*========================*/
trx_t
*
trx
)
/* in: transaction handle */
trx_t
*
trx
)
/* in: transaction handle */
{
{
if
(
UNIV_LIKELY
(
srv_thread_concurrency
>=
20
))
{
if
(
UNIV_LIKELY
(
srv_thread_concurrency
>=
SRV_CONCURRENCY_THRESHOLD
))
{
return
;
return
;
}
}
...
...
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