diff --git a/src/task.c b/src/task.c
index b49bc74..ca262d6 100644
--- a/src/task.c
+++ b/src/task.c
@@ -39,7 +39,7 @@
 	{
 		parent = *p;
 		task = rb_entry(parent, struct task, rb_node);
-		if (tv_cmp2(&task->expire, &newtask->expire) >= 0)
+		if (tv_cmp_ge2(&task->expire, &newtask->expire))
 			p = &(*p)->rb_left;
 		else
 			p = &(*p)->rb_right;
@@ -82,7 +82,7 @@
 		node = rb_prev(&task->rb_node);
 		if (node) {
 			prev = rb_entry(node, struct task, rb_node);
-			if (tv_cmp2(&prev->expire, &task->expire) >= 0) {
+			if (tv_cmp_ge(&prev->expire, &task->expire)) {
 				task_delete(task);
 				task->wq = &wait_queue[0];
 				rb_insert_task_queue(task);
@@ -93,7 +93,7 @@
 		node = rb_next(&task->rb_node);
 		if (node) {
 			next = rb_entry(node, struct task, rb_node);
-			if (tv_cmp2(&task->expire, &next->expire) > 0) {
+			if (tv_cmp_ge(&task->expire, &next->expire)) {
 				task_delete(task);
 				task->wq = &wait_queue[0];
 				rb_insert_task_queue(task);
diff --git a/src/time.c b/src/time.c
index 75f385e..1c5732f 100644
--- a/src/time.c
+++ b/src/time.c
@@ -13,6 +13,7 @@
 #include <sys/time.h>
 
 #include <common/config.h>
+#include <common/standard.h>
 #include <common/time.h>
 
 struct timeval now;             /* the current date at any moment */
@@ -59,17 +60,37 @@
 }
 
 /*
+ * compares <tv1> and <tv2> : returns 0 if tv1 < tv2, 1 if tv1 >= tv2,
+ * considering that 0 is the eternity.
+ */
+REGPRM2 int tv_cmp_ge2(const struct timeval *tv1, const struct timeval *tv2)
+{
+	if (unlikely(tv_iseternity(tv1)))
+		return 1;
+	if (unlikely(tv_iseternity(tv2)))
+		return 0; /* same */
+
+	if (tv1->tv_sec > tv2->tv_sec)
+		return 1;
+	if (tv1->tv_sec < tv2->tv_sec)
+		return 0;
+	if (tv1->tv_usec >= tv2->tv_usec)
+		return 1;
+	return 0;
+}
+
+/*
  * compares <tv1> and <tv2> : returns 0 if equal, -1 if tv1 < tv2, 1 if tv1 > tv2,
  * considering that 0 is the eternity.
  */
 REGPRM2 int tv_cmp2(const struct timeval *tv1, const struct timeval *tv2)
 {
-	if (tv_iseternity(tv1))
-		if (tv_iseternity(tv2))
+	if (unlikely(tv_iseternity(tv1)))
+		if (unlikely(tv_iseternity(tv2)))
 			return 0; /* same */
 		else
 			return 1; /* tv1 later than tv2 */
-	else if (tv_iseternity(tv2))
+	else if (likely(tv_iseternity(tv2)))
 		return -1; /* tv2 later than tv1 */
     
 	if (tv1->tv_sec > tv2->tv_sec)