diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:05:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:05:35 +0200 |
| commit | 03b33425e5a3de3fad070aa21e7fc7baf8104c81 (patch) | |
| tree | 2cc6c9da412eab9a2176ded10bdb1ca7cbb295de /include/my_pthread.h | |
| parent | 8ddcd0cda8e6e90a58e9ea64f0f3773ea0037f0b (diff) | |
| download | mariadb-git-03b33425e5a3de3fad070aa21e7fc7baf8104c81.tar.gz | |
many changes to my_getsystime.c:
* my_getsystime() is only an interval timer. Its value can beused for calculating
time intervals.
* renamed my_getsystime() to my_interval_timer(), to make the semantics
clearer and let the compiler catch wrong usages of my_getsystime()
(also future ones, that may come in merges).
* increased its granularity from 100ns to 1ns, old value was for UUID,
but as UUID can no longer use it directly there is no need to downgrade
the OS provided value
* fixed the UUID code to anchor the my_interval_timer() on the epoch, as
required by the UUID standard. That is, this was only needed by UUID,
and now I've moved it to UUID code from my_getsystime().
* fixed other wrong usages of my_getsystime() - e.g. in calculating
times for pthread_cond_timedwait. It was buggy and could've caused
long waits if OS clock would be changed.
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index a7e4ea25064..a2476d4265c 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -426,9 +426,9 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); #ifndef set_timespec_nsec #define set_timespec_nsec(ABSTIME,NSEC) \ { \ - ulonglong now= my_getsystime() + (NSEC/100); \ - (ABSTIME).ts_sec= (now / ULL(10000000)); \ - (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ + ulonglong now= my_hrtime().val*1000 + (NSEC); \ + (ABSTIME).ts_sec= now / 1000000000ULL; \ + (ABSTIME).ts_nsec= now % 1000000000ULL; \ } #endif /* !set_timespec_nsec */ #else @@ -444,9 +444,9 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); #ifndef set_timespec_nsec #define set_timespec_nsec(ABSTIME,NSEC) \ {\ - ulonglong now= my_getsystime() + (NSEC/100); \ - (ABSTIME).tv_sec= (time_t) (now / ULL(10000000)); \ - (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ + ulonglong now= my_hrtime().val*1000 + (NSEC); \ + (ABSTIME).tv_sec= (time_t) (now / 1000000000ULL); \ + (ABSTIME).tv_nsec= (long) (now % 1000000000ULL); \ } #endif /* !set_timespec_nsec */ #endif /* HAVE_TIMESPEC_TS_SEC */ |