mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
f197991f41
A lot of small fixes and new test cases. client/mysqlbinlog.cc: Cast removed client/mysqltest.cc: Added missing DBUG_RETURN include/my_pthread.h: set_timespec_time_nsec() now only takes one argument mysql-test/t/date_formats.test: Remove --disable_ps_protocl as now also ps supports microseconds mysys/my_uuid.c: Changed to use my_interval_timer() instead of my_getsystime() mysys/waiting_threads.c: Changed to use my_hrtime() sql/field.h: Added bool special_const_compare() for fields that may convert values before compare (like year) sql/field_conv.cc: Added test to get optimal copying of identical temporal values. sql/item.cc: Return that item_int is equal if it's positive, even if unsigned flag is different. Fixed Item_cache_str::save_in_field() to have identical null check as other similar functions Added proper NULL check to Item_cache_int::save_in_field() sql/item_cmpfunc.cc: Don't call convert_constant_item() if there is nothing that is worth converting. Simplified test when years should be converted sql/item_sum.cc: Mark cache values in Item_sum_hybrid as not constants to ensure they are not replaced by other cache values in compare_datetime() sql/item_timefunc.cc: Changed sec_to_time() to take a my_decimal argument to ensure we don't loose any sub seconds. Added Item_temporal_func::get_time() (This simplifies some things) sql/mysql_priv.h: Added Lazy_string_decimal() sql/mysqld.cc: Added my_decimal constants max_seconds_for_time_type, time_second_part_factor sql/table.cc: Changed expr_arena to be of type CONVENTIONAL_EXECUTION to ensure that we don't loose any items that are created by fix_fields() sql/tztime.cc: TIME_to_gmt_sec() now sets *in_dst_time_gap in case of errors This is needed to be able to detect if timestamp is 0 storage/maria/lockman.c: Changed from my_getsystime() to set_timespec_time_nsec() storage/maria/ma_loghandler.c: Changed from my_getsystime() to my_hrtime() storage/maria/ma_recovery.c: Changed from my_getsystime() to mmicrosecond_interval_timer() storage/maria/unittest/trnman-t.c: Changed from my_getsystime() to mmicrosecond_interval_timer() storage/xtradb/handler/ha_innodb.cc: Added support for new time,datetime and timestamp unittest/mysys/thr_template.c: my_getsystime() -> my_interval_timer() unittest/mysys/waiting_threads-t.c: my_getsystime() -> my_interval_timer()
135 lines
3.8 KiB
C
135 lines
3.8 KiB
C
/* Copyright (c) 2004, 2011, Oracle and/or its affiliates.
|
|
Copyright (c) 2009-2011 Monty Program Ab
|
|
|
|
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 */
|
|
|
|
|
|
#include "mysys_priv.h"
|
|
#include "my_static.h"
|
|
|
|
#ifdef __NETWARE__
|
|
#include <nks/time.h>
|
|
#elif defined(__WIN__)
|
|
#define OFFSET_TO_EPOC 116444736000000000LL
|
|
static ulonglong query_performance_frequency;
|
|
#endif
|
|
#ifdef HAVE_LINUX_UNISTD_H
|
|
#include <linux/unistd.h>
|
|
#endif
|
|
|
|
/*
|
|
return number of nanoseconds since unspecified (but always the same)
|
|
point in the past
|
|
|
|
NOTE:
|
|
Thus to get the current time we should use the system function
|
|
with the highest possible resolution
|
|
|
|
The value is not anchored to any specific point in time (e.g. epoch) nor
|
|
is it subject to resetting or drifting by way of adjtime() or settimeofday(),
|
|
and thus it is *NOT* appropriate for getting the current timestamp. It can be
|
|
used for calculating time intervals, though.
|
|
*/
|
|
|
|
ulonglong my_interval_timer()
|
|
{
|
|
#ifdef HAVE_CLOCK_GETTIME
|
|
struct timespec tp;
|
|
clock_gettime(CLOCK_MONOTONIC, &tp);
|
|
return tp.tv_sec*1000000000ULL+tp.tv_nsec;
|
|
#elif defined(HAVE_GETHRTIME)
|
|
return gethrtime();
|
|
#elif defined(__WIN__)
|
|
LARGE_INTEGER t_cnt;
|
|
if (query_performance_frequency)
|
|
{
|
|
QueryPerformanceCounter(&t_cnt);
|
|
return (t_cnt.QuadPart / query_performance_frequency * 1000000000ULL) +
|
|
((t_cnt.QuadPart % query_performance_frequency) * 1000000000ULL /
|
|
query_performance_frequency);
|
|
}
|
|
else
|
|
{
|
|
ulonglong newtime;
|
|
GetSystemTimeAsFileTime((FILETIME*)&newtime);
|
|
return newtime*100ULL;
|
|
}
|
|
#elif defined(__NETWARE__)
|
|
NXTime_t tm;
|
|
NXGetTime(NX_SINCE_1970, NX_NSECONDS, &tm);
|
|
return (ulonglong)tm;
|
|
#else
|
|
/* TODO: check for other possibilities for hi-res timestamping */
|
|
struct timeval tv;
|
|
gettimeofday(&tv,NULL);
|
|
return tv.tv_sec*1000000000ULL+tv.tv_usec*1000ULL;
|
|
#endif
|
|
}
|
|
|
|
|
|
/* Return current time in HRTIME_RESOLUTION (microseconds) since epoch */
|
|
|
|
my_hrtime_t my_hrtime()
|
|
{
|
|
my_hrtime_t hrtime;
|
|
#if defined(__WIN__)
|
|
ulonglong newtime;
|
|
GetSystemTimeAsFileTime((FILETIME*)&newtime);
|
|
newtime -= OFFSET_TO_EPOC;
|
|
hrtime.val= newtime/10;
|
|
#elif defined(HAVE_CLOCK_GETTIME)
|
|
struct timespec tp;
|
|
clock_gettime(CLOCK_REALTIME, &tp);
|
|
hrtime.val= tp.tv_sec*1000000ULL+tp.tv_nsec/1000ULL;
|
|
#else
|
|
struct timeval t;
|
|
/* The following loop is here because gettimeofday may fail */
|
|
while (gettimeofday(&t, NULL) != 0) {}
|
|
hrtime.val= t.tv_sec*1000000ULL + t.tv_usec;
|
|
#endif
|
|
return hrtime;
|
|
}
|
|
|
|
|
|
void my_time_init()
|
|
{
|
|
#ifdef __WIN__
|
|
compile_time_assert(sizeof(LARGE_INTEGER) ==
|
|
sizeof(query_performance_frequency));
|
|
if (QueryPerformanceFrequency((LARGE_INTEGER *)&query_performance_frequency) == 0)
|
|
query_performance_frequency= 0;
|
|
#endif
|
|
}
|
|
|
|
|
|
/*
|
|
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 */
|
|
}
|