diff options
Diffstat (limited to 'storage/innobase/include/srv0srv.h')
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 45 |
1 files changed, 14 insertions, 31 deletions
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 53c280287f2..d4556640c23 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -439,10 +439,6 @@ extern uint srv_fast_shutdown; /*!< If this is 1, do not do a InnoDB (but lose no committed transactions). */ -/** Signal to shut down InnoDB (NULL if shutdown was signaled, or if -running in innodb_read_only mode, srv_read_only_mode) */ -extern std::atomic<st_my_thread_var *> srv_running; - extern ibool srv_innodb_status; extern unsigned long long srv_stats_transient_sample_pages; @@ -785,13 +781,10 @@ srv_que_task_enqueue_low( /*=====================*/ que_thr_t* thr); /*!< in: query thread */ -/**********************************************************************//** -Check whether purge or master is active. -@return false if all are are suspended or have exited, true -if any are still active. */ +#ifdef UNIV_DEBUG +/** @return whether purge or master task is active */ bool srv_any_background_activity(); - -/*============================*/ +#endif extern "C" { @@ -801,7 +794,7 @@ void srv_monitor_task(void*); /** The periodic master task controlling the server. */ -void srv_master_callback(void *); +void srv_master_callback(void*); /** @@ -819,17 +812,13 @@ void srv_error_monitor_task(void*); } /* extern "C" */ -/**********************************************************************//** -Get count of tasks in the queue. -@return number of tasks in queue */ -ulint -srv_get_task_queue_length(void); -/*===========================*/ - +#ifdef UNIV_DEBUG +/** @return number of tasks in queue */ +ulint srv_get_task_queue_length(); +#endif /** Wakeup the purge threads. */ -void -srv_purge_wakeup(); +void srv_purge_wakeup(); /** Shut down the purge threads. */ void srv_purge_shutdown(); @@ -837,9 +826,6 @@ void srv_purge_shutdown(); /** Init purge tasks*/ void srv_init_purge_tasks(uint n_max); -/** Shut down purge tasks*/ -void srv_shutdown_purge_tasks(); - #ifdef UNIV_DEBUG /** Disables master thread. It's used by: SET GLOBAL innodb_master_thread_disabled_debug = 1 (0). @@ -1034,18 +1020,15 @@ extern std::unique_ptr<tpool::timer> srv_master_timer; extern std::unique_ptr<tpool::timer> srv_error_monitor_timer; extern std::unique_ptr<tpool::timer> srv_monitor_timer; -#define SRV_MONITOR_TIMER_PERIOD 5000 static inline void srv_monitor_timer_schedule_now() { - srv_monitor_timer->set_time(0, SRV_MONITOR_TIMER_PERIOD); + srv_monitor_timer->set_time(0, 5000); } -static inline void srv_start_periodic_timer( - std::unique_ptr<tpool::timer>& timer, - void (*func)(void*), - int period) +static inline void srv_start_periodic_timer(std::unique_ptr<tpool::timer>& t, + void (*func)(void*), int period) { - timer.reset(srv_thread_pool->create_timer(func)); - timer->set_time(0, period); + t.reset(srv_thread_pool->create_timer(func)); + t->set_time(0, period); } void srv_thread_pool_init(); |