Auto-merge from mysql-next-mr.

include/Makefile.am

@@ -38,6 +38,7 @@ noinst_HEADERS =	config-win.h config-netware.h lf.h my_bit.h \
 			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
 			my_handler.h my_time.h service_versions.h \
+			my_rdtsc.h \
 			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
 			atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \

include/my_rdtsc.h

@@ -0,0 +1,129 @@
+/* Copyright (C) 2008, 2009 Sun Microsystems, Inc
+
+  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 Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/*
+  rdtsc3 -- multi-platform timer code
+  pgulutzan@mysql.com, 2005-08-29
+  modified 2008-11-02
+*/
+
+#ifndef MY_RDTSC_H
+#define MY_RDTSC_H
+
+/**
+  Characteristics of a timer.
+*/
+struct my_timer_unit_info
+{
+  /** Routine used for the timer. */
+  ulonglong routine;
+  /** Overhead of the timer. */
+  ulonglong overhead;
+  /** Frequency of the  timer. */
+  ulonglong frequency;
+  /** Resolution of the timer. */
+  ulonglong resolution;
+};
+
+/**
+  Characteristics of all the supported timers.
+  @sa my_timer_init().
+*/
+struct my_timer_info
+{
+  /** Characteristics of the cycle timer. */
+  struct my_timer_unit_info cycles;
+  /** Characteristics of the nanosecond timer. */
+  struct my_timer_unit_info nanoseconds;
+  /** Characteristics of the microsecond timer. */
+  struct my_timer_unit_info microseconds;
+  /** Characteristics of the millisecond timer. */
+  struct my_timer_unit_info milliseconds;
+  /** Characteristics of the tick timer. */
+  struct my_timer_unit_info ticks;
+};
+
+typedef struct my_timer_info MY_TIMER_INFO;
+
+C_MODE_START
+
+/**
+  A cycle timer.
+  @return the current timer value, in cycles.
+*/
+ulonglong my_timer_cycles(void);
+
+/**
+  A namoseconds timer.
+  @return the current timer value, in nanoseconds.
+*/
+ulonglong my_timer_nanoseconds(void);
+
+/**
+  A microseconds timer.
+  @return the current timer value, in microseconds.
+*/
+ulonglong my_timer_microseconds(void);
+
+/**
+  A millisecond timer.
+  @return the current timer value, in milliseconds.
+*/
+ulonglong my_timer_milliseconds(void);
+
+/**
+  A ticks timer.
+  @return the current timer value, in ticks.
+*/
+ulonglong my_timer_ticks(void);
+
+/**
+  Timer initialization function.
+  @param [out] mti the timer characteristics.
+*/
+void my_timer_init(MY_TIMER_INFO *mti);
+
+C_MODE_END
+
+#define MY_TIMER_ROUTINE_ASM_X86                  1
+#define MY_TIMER_ROUTINE_ASM_X86_64               2
+#define MY_TIMER_ROUTINE_RDTSCLL                  3
+#define MY_TIMER_ROUTINE_ASM_X86_WIN              4
+#define MY_TIMER_ROUTINE_RDTSC                    5
+#define MY_TIMER_ROUTINE_ASM_IA64                 6
+#define MY_TIMER_ROUTINE_ASM_PPC                  7
+#define MY_TIMER_ROUTINE_SGI_CYCLE                8
+#define MY_TIMER_ROUTINE_GETHRTIME                9
+#define MY_TIMER_ROUTINE_READ_REAL_TIME          10
+#define MY_TIMER_ROUTINE_CLOCK_GETTIME           11
+#define MY_TIMER_ROUTINE_NXGETTIME               12
+#define MY_TIMER_ROUTINE_GETTIMEOFDAY            13
+#define MY_TIMER_ROUTINE_QUERYPERFORMANCECOUNTER 14
+#define MY_TIMER_ROUTINE_GETTICKCOUNT            15
+#define MY_TIMER_ROUTINE_TIME                    16
+#define MY_TIMER_ROUTINE_TIMES                   17
+#define MY_TIMER_ROUTINE_FTIME                   18
+#define MY_TIMER_ROUTINE_ASM_PPC64               19
+#define MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC64      20
+#define MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC32      21
+#define MY_TIMER_ROUTINE_ASM_SUNPRO_I386         22
+#define MY_TIMER_ROUTINE_ASM_GCC_SPARC64         23
+#define MY_TIMER_ROUTINE_ASM_GCC_SPARC32         24
+#define MY_TIMER_ROUTINE_MACH_ABSOLUTE_TIME      25
+#define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26
+#define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64       27
+
+#endif
+