diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-23 17:13:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-23 17:25:02 +0300 |
| commit | 97055e6b11508b53203aaadfe4618f543891c575 (patch) | |
| tree | 7034288581b76c2ed0f9101c9fb7d8784b5992cb /storage/innobase/include/srv0mon.h | |
| parent | 058c385e0356c21a0dd2280eaddcf604c04ae48c (diff) | |
| download | mariadb-git-97055e6b11508b53203aaadfe4618f543891c575.tar.gz | |
MDEV-14154: Remove ut_time_us()
Use microsecond_interval_timer()
or my_interval_timer() [in nanoseconds] instead.
Diffstat (limited to 'storage/innobase/include/srv0mon.h')
| -rw-r--r-- | storage/innobase/include/srv0mon.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h index 5b9fe0616fa..2a51780fcd8 100644 --- a/storage/innobase/include/srv0mon.h +++ b/storage/innobase/include/srv0mon.h @@ -2,7 +2,7 @@ Copyright (c) 2010, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2017, MariaDB Corporation. +Copyright (c) 2013, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -718,8 +718,8 @@ monitor counter #define MONITOR_INC_TIME_IN_MICRO_SECS(monitor, value) \ MONITOR_CHECK_DEFINED(value); \ if (MONITOR_IS_ON(monitor)) { \ - uintmax_t old_time = (value); \ - value = ut_time_us(NULL); \ + uintmax_t old_time = value; \ + value = microsecond_interval_timer(); \ MONITOR_VALUE(monitor) += (mon_type_t) (value - old_time);\ } |