diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-24 19:43:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-24 21:21:54 +0300 |
| commit | ab6dd774082c57f48d998e03655c06b672799b2d (patch) | |
| tree | 25c14f24e255a1480a97960005e415a43a52f3d1 /storage/innobase/include/ut0ut.h | |
| parent | 86767f4ac15db953c85a94ed81cd374c653e79dd (diff) | |
| download | mariadb-git-ab6dd774082c57f48d998e03655c06b672799b2d.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/ut0ut.h')
| -rw-r--r-- | storage/innobase/include/ut0ut.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h index b6e4d56d121..42b70ae53f2 100644 --- a/storage/innobase/include/ut0ut.h +++ b/storage/innobase/include/ut0ut.h @@ -112,22 +112,6 @@ private: # define UT_LOW_PRIORITY_CPU() ((void)0) # define UT_RESUME_PRIORITY_CPU() ((void)0) # endif - -/*********************************************************************//** -Delays execution for at most max_wait_us microseconds or returns earlier -if cond becomes true. -@param cond in: condition to wait for; evaluated every 2 ms -@param max_wait_us in: maximum delay to wait, in microseconds */ -#define UT_WAIT_FOR(cond, max_wait_us) \ -do { \ - ullint start_us; \ - start_us = ut_time_us(NULL); \ - while (!(cond) \ - && ut_time_us(NULL) - start_us < (max_wait_us)) {\ - \ - os_thread_sleep(2000 /* 2 ms */); \ - } \ -} while (0) #endif /* !UNIV_HOTBACKUP */ template <class T> T ut_min(T a, T b) { return(a < b ? a : b); } @@ -274,16 +258,6 @@ ut_usectime( ulint* ms); /*!< out: microseconds since the Epoch+*sec */ /**********************************************************//** -Returns the number of microseconds since epoch. Similar to -time(3), the return value is also stored in *tloc, provided -that tloc is non-NULL. -@return us since epoch */ -UNIV_INTERN -ullint -ut_time_us( -/*=======*/ - ullint* tloc); /*!< out: us since epoch, if non-NULL */ -/**********************************************************//** Returns the number of milliseconds since some epoch. The value may wrap around. It should only be used for heuristic purposes. |