diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-10 20:05:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-11 08:29:48 +0200 |
| commit | 574d8b29402f9826f73eeb54a3b9cc406268710c (patch) | |
| tree | 561112cee04b8fe28b1bdb153bc2e24dddf8b545 /storage/innobase/include/srv0srv.h | |
| parent | 6ec3682371116f58c88e3affa4f9e129aaa44fcf (diff) | |
| download | mariadb-git-574d8b29402f9826f73eeb54a3b9cc406268710c.tar.gz | |
MDEV-21907: Fix most clang -Wconversion in InnoDB
Declare innodb_purge_threads as 4-byte integer (UINT)
instead of 4-or-8-byte (ULONG) and adjust the documentation string.
Diffstat (limited to 'storage/innobase/include/srv0srv.h')
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 3a6f5a243ee..06785c2a3b7 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -401,10 +401,6 @@ The real value is set based on the value of io_capacity. */ #define SRV_MAX_IO_CAPACITY_DUMMY_DEFAULT (~0UL) #define SRV_MAX_IO_CAPACITY_LIMIT (~0UL) extern ulong srv_max_io_capacity; -/* Returns the number of IO operations that is X percent of the -capacity. PCT_IO(5) -> returns the number of IO operations that -is 5% of the max where max is srv_io_capacity. */ -#define PCT_IO(p) ((ulong) (srv_io_capacity * ((double) (p) / 100.0))) /* The "innodb_stats_method" setting, decides how InnoDB is going to treat NULL value when collecting statistics. It is not defined @@ -518,8 +514,8 @@ i/o handler thread */ extern const char* srv_io_thread_op_info[]; extern const char* srv_io_thread_function[]; -/* the number of purge threads to use from the worker pool (currently 0 or 1) */ -extern ulong srv_n_purge_threads; +/** innodb_purge_threads; the number of purge tasks to use */ +extern uint srv_n_purge_threads; /* the number of pages to purge in one batch */ extern ulong srv_purge_batch_size; @@ -552,8 +548,6 @@ extern ulong srv_fatal_semaphore_wait_threshold; /** Buffer pool dump status frequence in percentages */ extern ulong srv_buf_dump_status_frequency; -#define srv_max_purge_threads 32 - # ifdef UNIV_PFS_THREAD extern mysql_pfs_key_t page_cleaner_thread_key; extern mysql_pfs_key_t recv_writer_thread_key; |