1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread.c: introduce timespec_cmp for timespec comparisons

Browse Source 
This hopefully improves readability when comparing timespecs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-02-18 00:38:45 +00:00
parent b160a1139e
commit 014e9a4a18
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
thread.c
View File

@ -1197,6 +1197,26 @@ timespec_sub(struct timespec *dst, const struct timespec *tv)
} }
} }
static int
timespec_cmp(const struct timespec *a, const struct timespec *b)
{
if (a->tv_sec > b->tv_sec) {
return 1;
}
else if (a->tv_sec < b->tv_sec) {
return -1;
}
else {
if (a->tv_nsec > b->tv_nsec) {
return 1;
}
else if (a->tv_nsec < b->tv_nsec) {
return -1;
}
return 0;
}
}
/* /*
* @end is the absolute time when @ts is set to expire * @end is the absolute time when @ts is set to expire
* Returns true if @end has past * Returns true if @end has past
@ -1208,8 +1228,7 @@ timespec_update_expire(struct timespec *ts, const struct timespec *end)
struct timespec now; struct timespec now;
getclockofday(&now); getclockofday(&now);
if (end->tv_sec < now.tv_sec) return 1; if (timespec_cmp(&now, end) >= 0) return 1;
if (end->tv_sec == now.tv_sec && end->tv_nsec <= now.tv_nsec) return 1;
thread_debug("timespec_update_expire: " thread_debug("timespec_update_expire: "
"%"PRI_TIMET_PREFIX"d.%.6ld > %"PRI_TIMET_PREFIX"d.%.6ld\n", "%"PRI_TIMET_PREFIX"d.%.6ld > %"PRI_TIMET_PREFIX"d.%.6ld\n",
(time_t)end->tv_sec, (long)end->tv_nsec, (time_t)end->tv_sec, (long)end->tv_nsec,