merge.

checkpoint.
does not compile.

1 files changed, 25 insertions, 0 deletions

diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index cc5d1b83efb..60cd06b3968 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.c
@@ -25,6 +25,10 @@
 #include "mysys_priv.h"
 #include "my_static.h"
 
+#ifdef HAVE_LINUX_UNISTD_H
+#include <linux/unistd.h>
+#endif
+
 ulonglong my_getsystime()
 {
 #ifdef HAVE_CLOCK_GETTIME
@@ -218,3 +222,24 @@ time_t my_time_possible_from_micro(ulonglong microtime __attribute__((unused)))
 #endif  /* defined(__WIN__) */
 }
 
+
+/*
+  Return cpu time in milliseconds * 10
+*/
+
+ulonglong my_getcputime()
+{
+#ifdef HAVE_CLOCK_GETTIME
+  struct timespec tp;
+  if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp))
+    return 0;
+  return (ulonglong)tp.tv_sec*10000000+(ulonglong)tp.tv_nsec/100;
+#elif defined(__NR_clock_gettime)
+  struct timespec tp;
+  if (syscall(__NR_clock_gettime, CLOCK_THREAD_CPUTIME_ID, &tp))
+    return 0;
+  return (ulonglong)tp.tv_sec*10000000+(ulonglong)tp.tv_nsec/100;
+#else
+  return 0;
+#endif /* HAVE_CLOCK_GETTIME */
+}