From: compudj Date: Tue, 23 May 2006 19:58:09 +0000 (+0000) Subject: fix compare X-Git-Tag: v0.12.20~1651 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6cb026011f2203c2768e128c4963152a3648897d;p=lttv.git fix compare git-svn-id: http://ltt.polymtl.ca/svn@1838 04897980-b3bd-0310-b5e0-8ef037075253 --- diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h index 2bf3048e..14c15d1d 100644 --- a/ltt/branches/poly/ltt/time.h +++ b/ltt/branches/poly/ltt/time.h @@ -90,14 +90,10 @@ static inline LttTime ltt_time_add(LttTime t1, LttTime t2) static inline int ltt_time_compare(LttTime t1, LttTime t2) { int ret=0; - //if(likely(t1.tv_sec > t2.tv_sec)) ret = 1; - //else if(unlikely(t1.tv_sec < t2.tv_sec)) ret = -1; - //else if(likely(t1.tv_nsec > t2.tv_nsec)) ret = 1; - //else if(unlikely(t1.tv_nsec < t2.tv_nsec)) ret = -1; - if(likely((long)t1.tv_sec - (long)t2.tv_sec > 0)) ret = 1; - else if(unlikely((long)t1.tv_sec - (long)t2.tv_sec < 0)) ret = -1; - else if(likely((long)t1.tv_nsec - (long)t2.tv_nsec > 0)) ret = 1; - else if(unlikely((long)t1.tv_nsec - (long)t2.tv_nsec < 0)) ret = -1; + if(likely(t1.tv_sec > t2.tv_sec)) ret = 1; + else if(unlikely(t1.tv_sec < t2.tv_sec)) ret = -1; + else if(likely(t1.tv_nsec > t2.tv_nsec)) ret = 1; + else if(unlikely(t1.tv_nsec < t2.tv_nsec)) ret = -1; return ret; }