summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-10-02 22:14:21 +0200
committerSergei Golubchik <serg@mariadb.org>2022-10-02 22:14:21 +0200
commit900d7bf3604e7ba265f06d96f76a049dc3c4c9af (patch)
treec447b67842760bdc3ccae31aebb987fee4071842 /include/my_sys.h
parent2ab52cc0e5c3cc792608a518625a08e6d3734ce4 (diff)
parent3a2116241b128b811ee2455845ff9710da3115ac (diff)
downloadmariadb-git-900d7bf3604e7ba265f06d96f76a049dc3c4c9af.tar.gz
Merge branch '10.5' into 10.6
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 7eda45b6cc2..0a6e6088067 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -956,6 +956,17 @@ extern ulonglong my_getcputime(void);
#define hrtime_sec_part(X) ((ulong)((X).val % HRTIME_RESOLUTION))
#define my_time(X) hrtime_to_time(my_hrtime_coarse())
+/**
+ Make high resolution time from two parts.
+*/
+
+static inline my_hrtime_t make_hr_time(my_time_t time, ulong time_sec_part)
+{
+ my_hrtime_t res= {((ulonglong) time)*1000000 + time_sec_part};
+ return res;
+}
+
+
#if STACK_DIRECTION < 0
#define available_stack_size(CUR,END) (long) ((char*)(CUR) - (char*)(END))
#else