diff options
Diffstat (limited to 'storage/innobase/include/srv0conc.h')
| -rw-r--r-- | storage/innobase/include/srv0conc.h | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/storage/innobase/include/srv0conc.h b/storage/innobase/include/srv0conc.h index cf61ef5528d..9573c5add84 100644 --- a/storage/innobase/include/srv0conc.h +++ b/storage/innobase/include/srv0conc.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2011, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2011, 2014, Oracle and/or its affiliates. All Rights Reserved. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -52,32 +52,18 @@ we could get a deadlock. Value of 0 will disable the concurrency check. */ extern ulong srv_thread_concurrency; -/*********************************************************************//** -Initialise the concurrency management data structures */ -void -srv_conc_init(void); -/*===============*/ - -/*********************************************************************//** -Free the concurrency management data structures */ -void -srv_conc_free(void); -/*===============*/ - +struct row_prebuilt_t; /*********************************************************************//** Puts an OS thread to wait if there are too many concurrent threads -(>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. */ -UNIV_INTERN +(>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. +@param[in,out] prebuilt row prebuilt handler */ void srv_conc_enter_innodb( -/*==================*/ - trx_t* trx); /*!< in: transaction object associated - with the thread */ + row_prebuilt_t* prebuilt); /*********************************************************************//** This lets a thread enter InnoDB regardless of the number of threads inside InnoDB. This must be called when a thread ends a lock wait. */ -UNIV_INTERN void srv_conc_force_enter_innodb( /*========================*/ @@ -87,7 +73,6 @@ srv_conc_force_enter_innodb( /*********************************************************************//** This must be called when a thread exits InnoDB in a lock wait or at the end of an SQL statement. */ -UNIV_INTERN void srv_conc_force_exit_innodb( /*=======================*/ @@ -96,14 +81,12 @@ srv_conc_force_exit_innodb( /*********************************************************************//** Get the count of threads waiting inside InnoDB. */ -UNIV_INTERN ulint srv_conc_get_waiting_threads(void); /*==============================*/ /*********************************************************************//** Get the count of threads active inside InnoDB. */ -UNIV_INTERN ulint srv_conc_get_active_threads(void); /*==============================*/ |