diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 10:30:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 10:43:11 +0300 |
| commit | f6ea0389a4ea61dd0accbc3f949ef6c6d9a91417 (patch) | |
| tree | 85b3d06e5a4a1e6a90f8d87d8ccd89034e8e8a56 /storage/innobase/handler | |
| parent | e32f29b7f31945d2e89d601cb030b3552c3bfde3 (diff) | |
| download | mariadb-git-f6ea0389a4ea61dd0accbc3f949ef6c6d9a91417.tar.gz | |
Replace ut_timer() with my_interval_timer()
The function pointer ut_timer() was only used by the
InnoDB defragmenting thread. Let InnoDB use a single monotonic
high-precision timer, my_interval_timer() [in nanoseconds],
occasionally wrapped by microsecond_interval_timer().
srv_defragment_interval: Change from "timer" units to nanoseconds.
This concludes the InnoDB time function cleanup that was
motivated by MDEV-14154. Only ut_time_ms() will remain for now,
wrapping my_interval_timer().
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b14fe261c13..081fcbd9c51 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -95,7 +95,6 @@ MYSQL_PLUGIN_IMPORT extern char mysql_unpacked_real_data_home[]; #include "dict0stats_bg.h" #include "ha_prototypes.h" #include "ut0mem.h" -#include "ut0timer.h" #include "ibuf0ibuf.h" #include "dict0dict.h" #include "srv0mon.h" @@ -18052,8 +18051,7 @@ innodb_defragment_frequency_update( from check function */ { srv_defragment_frequency = (*static_cast<const uint*>(save)); - srv_defragment_interval = ut_microseconds_to_timer( - 1000000.0 / srv_defragment_frequency); + srv_defragment_interval = 1000000000ULL / srv_defragment_frequency; } /****************************************************************//** |