7a5573f
Support s390/s390x in performance schema's cycle-counting functions.
7a5573f
Filed upstream at http://bugs.mysql.com/bug.php?id=59953
7a5573f
7a5573f
Jakub Dorňák bf0a83b
diff -up --recursive mysql-5.7.9.orig/include/my_rdtsc.h mysql-5.7.9/include/my_rdtsc.h
Jakub Dorňák bf0a83b
--- mysql-5.7.9.orig/include/my_rdtsc.h	2015-10-12 08:21:33.000000000 +0200
Jakub Dorňák bf0a83b
+++ mysql-5.7.9/include/my_rdtsc.h	2015-11-10 16:33:36.037432669 +0100
7a5573f
@@ -125,6 +125,7 @@ C_MODE_END
7a5573f
 #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26
7a5573f
 #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64       27
Jakub Dorňák bf0a83b
 #define MY_TIMER_ROUTINE_ASM_AARCH64             28
Jakub Dorňák bf0a83b
+#define MY_TIMER_ROUTINE_ASM_S390                29
7a5573f
 
7a5573f
 #endif
7a5573f
 
Jakub Dorňák bf0a83b
diff -up --recursive mysql-5.7.9.orig/mysys/my_rdtsc.c mysql-5.7.9/mysys/my_rdtsc.c
Jakub Dorňák bf0a83b
--- mysql-5.7.9.orig/mysys/my_rdtsc.c	2015-10-12 08:21:33.000000000 +0200
Jakub Dorňák bf0a83b
+++ mysql-5.7.9/mysys/my_rdtsc.c	2015-11-10 16:33:36.038432668 +0100
Jakub Dorňák bf0a83b
@@ -183,6 +183,13 @@ ulonglong my_timer_cycles(void)
Jakub Dorňák bf0a83b
     __asm __volatile__ ("mrs %[rt],cntvct_el0" : [rt] "=r" (result));
Jakub Dorňák bf0a83b
     return result;
7a5573f
   }
7a5573f
+#elif defined(__GNUC__) && defined(__s390__)
7a5573f
+  /* covers both s390 and s390x */
7a5573f
+  {
7a5573f
+    ulonglong result;
7a5573f
+    __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc");
Jakub Dorňák bf0a83b
+   return result;
7a5573f
+  }
7a5573f
 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
7a5573f
   /* gethrtime may appear as either cycle or nanosecond counter */
7a5573f
   return (ulonglong) gethrtime();
Jakub Dorňák bf0a83b
@@ -487,6 +494,8 @@ void my_timer_init(MY_TIMER_INFO *mti)
7a5573f
   mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC32;
Jakub Dorňák bf0a83b
 #elif defined(__GNUC__) && defined(__aarch64__)
Jakub Dorňák bf0a83b
   mti->cycles.routine= MY_TIMER_ROUTINE_ASM_AARCH64;
7a5573f
+#elif defined(__GNUC__) && defined(__s390__)
7a5573f
+  mti->cycles.routine= MY_TIMER_ROUTINE_ASM_S390;
7a5573f
 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
7a5573f
   mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME;
7a5573f
 #else